Resolve conflicts

TykTechnologies · Nov 7, 2023 · 4264c08 · 4264c08
1 parent 4f85bde
commit 4264c08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/gateway/analytics_test.go b/gateway/analytics_test.go
@@ -1,20 +1,21 @@
 package gateway
 
 import (
-<<<<<<< HEAD
-=======
 	"encoding/base64"
 	"net/http"
 	"net/http/httptest"
 	"strings"
->>>>>>> e4b0f9eb... TT-8934 Fix chunked response analytics (#5495)
 	"testing"
+	"time"
 
+	"github.com/TykTechnologies/tyk-pump/analytics"
+	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
+	"github.com/TykTechnologies/tyk/test"
+	"github.com/TykTechnologies/tyk/user"
+	"github.com/stretchr/testify/assert"
 )
 
-<<<<<<< HEAD
-=======
 func TestAnalytics_Write(t *testing.T) {
 	test.Flaky(t)
 	tcs := []struct {
@@ -521,7 +522,6 @@ func TestAnalytics_Write(t *testing.T) {
 
 }
 
->>>>>>> e4b0f9eb... TT-8934 Fix chunked response analytics (#5495)
 func TestGeoIPLookup(t *testing.T) {
 	ts := StartTest(nil)
 	defer ts.Close()

diff --git a/gateway/handler_success.go b/gateway/handler_success.go
@@ -11,13 +11,8 @@ import (
 	"strings"
 	"time"
 
-<<<<<<< HEAD
-=======
-	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/internal/httputil"
 
-	"github.com/TykTechnologies/tyk-pump/analytics"
->>>>>>> e4b0f9eb... TT-8934 Fix chunked response analytics (#5495)
 	"github.com/TykTechnologies/tyk/config"
 	"github.com/TykTechnologies/tyk/ctx"
 	"github.com/TykTechnologies/tyk/headers"