update

2024-04-01 10:35:59 +02:00
parent d27af65678
commit 4626df312b
2 changed files with 24 additions and 16 deletions
--- a/Traefik/docker-compose.yml
+++ b/Traefik/docker-compose.yml
@ -1,7 +1,3 @@
---
-<<<<<<< HEAD
-version: '3.7'
-
 #### NETWORKS
 networks:
  back_network:
@ -12,18 +8,6 @@ networks:
    attachable: true

 #### SERVICES
-=======
-### networks
-networks:
-  back_network:
-    driver: bridge
-    attachable: true
-  front_network:
-    driver: bridge
-    attachable: true
-
-### services
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
 services:

 ### traefik