minor change

apache · Mar 20, 2024 · cc78417 · cc78417
1 parent a273baa
commit cc78417
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxFunctionsValidateSuite.scala b/backends-velox/src/test/scala/io/glutenproject/execution/VeloxFunctionsValidateSuite.scala
@@ -470,7 +470,6 @@ class VeloxFunctionsValidateSuite extends VeloxWholeStageTransformerSuite {
     }
   }
 
-<<<<<<< HEAD
   test("Test make_timestamp function") {
     withTempPath {
       path =>
@@ -511,11 +510,12 @@ class VeloxFunctionsValidateSuite extends VeloxWholeStageTransformerSuite {
                              |""".stripMargin) {
           checkOperatorMatch[ProjectExecTransformer]
         }
-=======
+    }
+  }
+
   test("Test uuid function") {
     runQueryAndCompare("""SELECT uuid() from lineitem limit 100""".stripMargin, false) {
       checkOperatorMatch[ProjectExecTransformer]
->>>>>>> 4968b83b1 ([VL] support uuid function)
     }
   }
 }