Fix merge conflict in Caddyfile for nzbget route

This commit is contained in:
Nils-Johan Gynther
2026-06-20 13:12:16 +02:00
parent 38175f0401
commit 2bc7969467
-3
View File
@@ -25,14 +25,11 @@ test.gynther.se {
reverse_proxy recipe-flutter:5000 reverse_proxy recipe-flutter:5000
} }
<<<<<<< HEAD
nzbget.gynther.se { nzbget.gynther.se {
import common import common
reverse_proxy http://192.168.50.4:6789 reverse_proxy http://192.168.50.4:6789
} }
=======
>>>>>>> 0f6813d (Update Caddyfile routes and auth import)
prowlarr.gynther.se { prowlarr.gynther.se {
import common import common
reverse_proxy http://prowlarr:9696 reverse_proxy http://prowlarr:9696