Remove clutter

traefik/docker-compose.yml

@@ -6,7 +6,7 @@ networks:
   socket_proxy:
     external:
       name: socket_proxy
-  
+
 
 services:
   # Only accept needed incoming docker API calls
@@ -103,17 +103,13 @@ services:
       - "--log.level=DEBUG"
       # API and Dashboard
       #- "--api.insecure=true"
-      - "--api=true"      
+      - "--api=true"
       - "--api.dashboard=true"
       # Docker as provider
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       # Entrypoints (not HTTPS)
       - "--entrypoints.web.address=:80"
-<<<<<<< HEAD
-      #- "--entrypoints.teamspeak.address=:9987/udp"
-=======
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
       # HTTPS (websecure entrypoint)
       - "--entrypoints.websecure.address=:443"
       # TS3 entrypoints
@@ -145,10 +141,7 @@ services:
       - "traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)"
       - "traefik.http.routers.http_catchall.entrypoints=web"
       - "traefik.http.routers.http_catchall.middlewares=https-redirect"
-<<<<<<< HEAD
 
-=======
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
     ports:
       # The HTTP port
       - "80:80"