chore: fix merge typo

2026-03-15 11:12:02 +00:00 · 2026-03-14 19:57:50 +02:00
parent fcf0df348a
commit bd57c480f3
1 changed files with 0 additions and 4 deletions
--- a/internal/controller/proxy_controller.go
+++ b/internal/controller/proxy_controller.go
@@ -36,11 +36,7 @@ type ProxyContext struct {
 	Proto     string
 	Path      string
 	Method    string
-<<<<<<< HEAD
-	Type      RequestType
-=======
 	Type      AuthModuleType
->>>>>>> main
 	IsBrowser bool
 }