From 2bc7969467dc1e72c4857ec4971a74ce9d340143 Mon Sep 17 00:00:00 2001
From: Nils-Johan Gynther <nils-johan.gynther@neoleaf.se>
Date: Sat, 20 Jun 2026 13:12:16 +0200
Subject: [PATCH] Fix merge conflict in Caddyfile for nzbget route

---
 conf/Caddyfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/Caddyfile b/conf/Caddyfile
index cb71df0..70e4b61 100644
--- a/conf/Caddyfile
+++ b/conf/Caddyfile
@@ -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