Fix merge conflict in Caddyfile for nzbget route
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user