Resolve conflicts in util.go, util_test.go

TykTechnologies · Nov 6, 2023 · d17ef07 · d17ef07
1 parent 6723103
commit d17ef07
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/gateway/util.go b/gateway/util.go
@@ -2,6 +2,7 @@ package gateway
 
 import (
 	"errors"
+	"net/url"
 	"os"
 
 	"github.com/TykTechnologies/tyk/apidef"
@@ -158,8 +159,6 @@ func shouldReloadSpec(existingSpec, newSpec *APISpec) bool {
 
 	return false
 }
-<<<<<<< HEAD
-=======
 
 // check if 2 maps are the same
 func areMapsEqual(a, b map[string]string) bool {
@@ -183,4 +182,3 @@ func containsEscapedChars(str string) bool {
 
 	return str != unescaped
 }
->>>>>>> 4346303f... [TT-9327] Decoding the URL request first, before handling any additional logic (#5345)
diff --git a/gateway/util_test.go b/gateway/util_test.go
@@ -215,8 +215,6 @@ func Test_shouldReloadSpec(t *testing.T) {
 		assertionHelper(t, tcs)
 	})
 }
-<<<<<<< HEAD
-=======
 
 func TestAreMapsEqual(t *testing.T) {
 	tests := []struct {
@@ -279,4 +277,3 @@ func TestContainsEscapedCharacters(t *testing.T) {
 		})
 	}
 }
->>>>>>> 4346303f... [TT-9327] Decoding the URL request first, before handling any additional logic (#5345)