resolve conflict

francoispqt · Dec 5, 2018 · 489e3d3 · 489e3d3
1 parent f2b0fa2
commit 489e3d3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/decode_string_test.go b/decode_string_test.go
@@ -385,8 +385,6 @@ func TestSkipString(t *testing.T) {
 			err:            true,
 			errType:        InvalidJSONError(""),
 		},
-<<<<<<< HEAD
-=======
 		{
 			name:           "string-solidus",
 			json:           `Asia\/Bangkok","enable":true}"`,
@@ -399,7 +397,6 @@ func TestSkipString(t *testing.T) {
 			expectedResult: "",
 			err:            false,
 		},
->>>>>>> da3273f... fix error when skipping unicode string
 	}
 
 	for _, testCase := range testCases {