Skip to content

Commit

Permalink
Resolve conflicts in util.go, util_test.go
Browse files Browse the repository at this point in the history
  • Loading branch information
Tit Petric authored and titpetric committed Nov 6, 2023
1 parent a00b4bf commit ce9e103
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
4 changes: 1 addition & 3 deletions gateway/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package gateway

import (
"errors"
"net/url"
"os"

"github.com/TykTechnologies/tyk/apidef"
Expand Down Expand Up @@ -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 {
Expand All @@ -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)
3 changes: 0 additions & 3 deletions gateway/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,6 @@ func Test_shouldReloadSpec(t *testing.T) {
assertionHelper(t, tcs)
})
}
<<<<<<< HEAD
=======

func TestAreMapsEqual(t *testing.T) {
tests := []struct {
Expand Down Expand Up @@ -279,4 +277,3 @@ func TestContainsEscapedCharacters(t *testing.T) {
})
}
}
>>>>>>> 4346303f... [TT-9327] Decoding the URL request first, before handling any additional logic (#5345)

0 comments on commit ce9e103

Please sign in to comment.