Merge branch 'configurable-endpoint-id-passing' into envoy-set-header…

…-from-subdomain
buildwithgrove · Dec 13, 2024 · 023d44f · 023d44f
2 parents 082d250 + 8fcea33
commit 023d44f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/request/parser.go b/request/parser.go
@@ -25,11 +25,7 @@ import (
 // HTTPHeaderTargetServiceID is the key used to lookup the HTTP header specifying the target service's ID.
 // Please see the following link for more details on not including `X-` prefix in the HTTP header parameter names.
 // https://www.rfc-editor.org/rfc/rfc6648#section-3
-<<<<<<< HEAD
 const HTTPHeaderTargetServiceID = "target-service-id"
-=======
-const HTTPHeaderTargetServiceID = "Target-Service-ID"
->>>>>>> af4a32ffcd5f0f67d97668fbe8271675cb8db219
 
 type (
 	Parser struct {