Remove clutter

ts3/README.md

@@ -1,8 +1,2 @@
-<<<<<<< HEAD
-No traefik ready!
-
-This is service is not routed by traefik because the UDP routing causes package loss.
-=======
-This is now routed via traefik. 
-Still checking performance if working it is.
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
+This is now routed via traefik.
+Still checking performance if there is no package loss.

ts3/docker-compose.yml

@@ -2,9 +2,8 @@ version: '3.5'
 
 networks:
   default:
-<<<<<<< HEAD
-  external:
-  name: traefik_default
+    external:
+      name: traefik_default
 
 services:
   teamspeak-app:
@@ -42,9 +41,6 @@ teamspeak-db:
   restart: unless-stopped
   volumes:
   - ./db:/var/lib/mysql
-=======
-    external:
-      name: traefik_default
 
 services:
   teamspeak-app:
@@ -67,7 +63,7 @@ services:
       - "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp"
       - "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp"
       - "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)"
-      - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"      
+      - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"
       # udp
       - "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp"
       - "traefik.udp.routers.teamspeak-udp.service=teamspeak-udp"