FIX: Fixing broken rebase :D

2025-08-25 17:55:19 +02:00
parent 40668b67dc
commit b5ecc227d0
1 changed files with 0 additions and 9 deletions
--- a/semaphore-ui/docker-compose.yml
+++ b/semaphore-ui/docker-compose.yml
@@ -9,18 +9,9 @@ services:
            SEMAPHORE_ADMIN_PASSWORD: ${ADMIN_PASS}
            SEMAPHORE_ADMIN_NAME: ${ADMIN_NAME}
            SEMAPHORE_ADMIN_EMAIL: ${ADMIN_EMAIL}
-<<<<<<< HEAD
        volumes:       
            - semaphore-data:/var/lib/semaphore
            - semaphore-config:/etc/semaphore  
 volumes:
  semaphore-data:
  semaphore-config:
-=======
-        volumes:
-            - /home/mbuz/docker/semaphore/data:/var/lib/semaphore
-            - /home/mbuz/docker/semaphore/config:/etc/semaphore
-volumes:
-    /home/mbuz/docker/semaphore/data:
-    /home/mbuz/docker/semaphore/config:
->>>>>>> 24861aa (ADD: Semaphore UI initial commit)