Resolve conflicts

TykTechnologies · Nov 6, 2023 · f963896 · f963896
1 parent 5b8d1f5
commit f963896
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/gateway/server.go b/gateway/server.go
@@ -20,11 +20,8 @@ import (
 	"strings"
 	"sync"
 
-<<<<<<< HEAD
 	"github.com/TykTechnologies/tyk/internal/crypto"
-=======
 	"github.com/TykTechnologies/tyk/internal/httputil"
->>>>>>> 3b1379e4... [TT-9284] Ensure that old transport will close idle connections (#5231)
 
 	"sync/atomic"
 	textTemplate "text/template"

diff --git a/gateway/testutil.go b/gateway/testutil.go
@@ -33,11 +33,7 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/net/context"
 
-<<<<<<< HEAD
-=======
 	"github.com/TykTechnologies/tyk/internal/httputil"
-	"github.com/TykTechnologies/tyk/internal/otel"
->>>>>>> 3b1379e4... [TT-9284] Ensure that old transport will close idle connections (#5231)
 	"github.com/TykTechnologies/tyk/internal/uuid"
 
 	"github.com/TykTechnologies/graphql-go-tools/pkg/execution/datasource"
@@ -1023,16 +1019,9 @@ func (s *Test) BootstrapGw(ctx context.Context, cancelFn context.CancelFunc, gen
 	}
 	gwConfig.CoProcessOptions = s.config.CoprocessConfig
 
-<<<<<<< HEAD
-	s.gwMu.Lock()
-	s.Gw = NewGateway(gwConfig, ctx, cancelFn)
-	s.Gw.setTestMode(true)
-	s.gwMu.Unlock()
-=======
-	gw := NewGateway(gwConfig, s.ctx)
+	gw := NewGateway(gwConfig, ctx, cancelFn)
 	gw.setTestMode(true)
 	gw.ConnectionWatcher = httputil.NewConnectionWatcher()
->>>>>>> 3b1379e4... [TT-9284] Ensure that old transport will close idle connections (#5231)
 
 	s.MockHandle = MockHandle