From bd57c480f3ab91d065bb815e6e6b66fcee6a3f59 Mon Sep 17 00:00:00 2001 From: Stavros Date: Sat, 14 Mar 2026 19:57:50 +0200 Subject: [PATCH] chore: fix merge typo --- internal/controller/proxy_controller.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/controller/proxy_controller.go b/internal/controller/proxy_controller.go index 5da93e2..b9cdf9d 100644 --- 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 }