Resolve conflict

TykTechnologies · Nov 6, 2023 · 3572a51 · 3572a51
1 parent 038b131
commit 3572a51
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/gateway/api_loader.go b/gateway/api_loader.go
@@ -751,7 +751,6 @@ func (gw *Gateway) loadHTTPService(spec *APISpec, apisByListen map[string]int, g
 		spec.Proxy.ListenPath,
 	}
 
-<<<<<<< HEAD
 	// Register routes for each prefixe
 	for _, prefix := range prefixes {
 		subrouter := router.PathPrefix(prefix).Subrouter()
@@ -767,10 +766,6 @@ func (gw *Gateway) loadHTTPService(spec *APISpec, apisByListen map[string]int, g
 		// Attach handlers
 		subrouter.NewRoute().Handler(httpHandler)
 	}
-=======
-	httpHandler := explicitRouteSubpaths(spec.Proxy.ListenPath, chainObj.ThisHandler, gwConfig.HttpServerOptions.EnableStrictRoutes)
-	subrouter.NewRoute().Handler(httpHandler)
->>>>>>> 213ac5b3... [TT-9924]remove muxer, proxy from explicitRouteHandler (#5482)
 
 	return chainObj
 }