From 4d3a66f4780fb722d680db02c31ce0b1df496c77 Mon Sep 17 00:00:00 2001
From: Muneeb Ullah Khan
 <100969065+MuneebUllahKhan222@users.noreply.github.com>
Date: Thu, 2 Jul 2026 17:36:05 +0500
Subject: [PATCH] fixed syntax error (#5109)

---
 pkg/feature/feature.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/feature/feature.go b/pkg/feature/feature.go
index 838fc895a..4b8c9a654 100644
--- a/pkg/feature/feature.go
+++ b/pkg/feature/feature.go
@@ -28,11 +28,8 @@ var (
 	BraintrustDetectorEnabled       atomic.Bool
 	PgAnalyzeReadKeyDetectorEnabled atomic.Bool
 	RedHatPyxisDetectorEnabled      atomic.Bool
-<<<<<<< oct-deploy-detector
 	OctopusDeployDetectorEnabled    atomic.Bool
-=======
-  DropUnverifiedJWTResults        atomic.Bool
->>>>>>> main
+	DropUnverifiedJWTResults        atomic.Bool
 )
 
 type AtomicString struct {