Загрузить файлы в «/»

docker-compose.yaml

@@ -1,26 +1,6 @@
 services:
   web:
     build: .        # Путь к Dockerfile (в текущей директории)
-<<<<<<< HEAD
-    container_name: workshop
-    # ports:
-    #   - "80:5000"  # Проброс портов
-    volumes:
-      - /storage/public/complete/workshop/:/data
-    networks:
-      - all
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.workshop.rule=Host(`csgoworkshop.ru`) || Host(`www.csgoworkshop.ru`)
-      - traefik.http.routers.workshop.entrypoints=websecure, web
-      - traefik.http.routers.workshop.tls=true
-      - traefik.http.routers.workshop.tls.certresolver=production-cloudflare
-    restart: unless-stopped
-
-networks:
-  all:
-    external: true
-=======
     ports:
       - "80:5000"  # Проброс портов
     volumes:
@@ -32,4 +12,3 @@ volumes:
       type: cifs
       o: "username=Shaman,password="
       device: "//192.168.31.3/share/public/complete/workshop"
->>>>>>> 9cc0929a09596abeb93ee7f2711527fb5da25f7a

requirements.txt

@@ -1,8 +1,4 @@
 aiosqlite~=0.20.0
 Hypercorn~=0.17.3
 Quart~=0.19.6
-<<<<<<< HEAD
 babel~=2.16.0
-=======
-babel~=2.16.0
->>>>>>> 9cc0929a09596abeb93ee7f2711527fb5da25f7a