resolve conflicts

apache · May 9, 2024 · e9cb9d2 · e9cb9d2
1 parent 114d8a3
commit e9cb9d2
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JacksonParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JacksonParser.scala
@@ -276,8 +276,7 @@ class JacksonParser(
           }
       }
 
-<<<<<<< HEAD
-    case StringType => (parser: JsonParser) => {
+    case _: StringType => (parser: JsonParser) => {
       val includeSourceInLocation = JsonParser.Feature.INCLUDE_SOURCE_IN_LOCATION
       val originalMask = if (includeSourceInLocation.enabledIn(parser.getFeatureMask)) {
         1
@@ -286,10 +285,6 @@ class JacksonParser(
       }
       parser.overrideStdFeatures(includeSourceInLocation.getMask, includeSourceInLocation.getMask)
       val result = parseJsonToken[UTF8String](parser, dataType) {
-=======
-    case _: StringType =>
-      (parser: JsonParser) => parseJsonToken[UTF8String](parser, dataType) {
->>>>>>> e1fb1d7e063af7e8eb6e992c800902aff6e19e15
         case VALUE_STRING =>
           UTF8String.fromString(parser.getText)