From cc784177c60f380be5a1cb7b1c26cd148bee0ad5 Mon Sep 17 00:00:00 2001
From: zhli1142015 <zhli@microsoft.com>
Date: Wed, 20 Mar 2024 10:55:50 +0800
Subject: [PATCH] minor change

---
 .../execution/VeloxFunctionsValidateSuite.scala             | 6 +++---
 1 file changed, 3 insertions(+), 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
index 9d600d60690f7..544cfece7752f 100644
--- 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)
     }
   }
 }