Fix merge conflict in Caddyfile for nzbget route

2026-06-20 13:12:16 +02:00
parent 38175f0401
commit 2bc7969467
1 changed files with 0 additions and 3 deletions
@@ -25,14 +25,11 @@ test.gynther.se {
 	reverse_proxy recipe-flutter:5000
 }

-<<<<<<< HEAD
 nzbget.gynther.se {
 	import common
 	reverse_proxy http://192.168.50.4:6789
 }

-=======
->>>>>>> 0f6813d (Update Caddyfile routes and auth import)
 prowlarr.gynther.se {
 	import common
 	reverse_proxy http://prowlarr:9696