Updated docs

1ForeverHD · Mar 28, 2024 · 6c65936 · 6c65936
1 parent d52322a
commit 6c65936
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -62,13 +62,5 @@ nav:
     - Features: features.md
     - Installation: installation.md
     - Third Parties: third_parties.md
-<<<<<<< HEAD
     - API: api.md
   - Contributing: contributing.md
-=======
-    - API:
-      - Icon: api/icon.md
-      - IconController: api/icon_controller.md
-  - Contributing: contributing.md
-  - Changelog: changelog.md
->>>>>>> 621f66572deb1b1cff4842788ab45180ee365d83