fix

10 months ago · af887bae7d
parent 132671e490
commit af887bae7d
1 changed files with 0 additions and 3 deletions
--- a/mkdocs.yml
+++ b/mkdocs.yml
@ -34,10 +34,7 @@ nav:
        - Cron: docker/nextcloud/cron.md
        - Проблемы с data: docker/nextcloud/problems-after-moving-data-folder.md
        - OCC: docker/nextcloud/occ-files-scan.md
-<<<<<<< HEAD
-=======
      - Photoprism: docker/photoprism.md
->>>>>>> 49f6799 (?)
      - Pictshare: docker/pictshare.md
      - Plex: 
        - docker/plex/index.md