Update gtest_arithmetic_functions.cpp

pingcap · Mar 13, 2023 · c84d7d5 · c84d7d5
1 parent 1fc4ccd
commit c84d7d5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/dbms/src/Functions/tests/gtest_arithmetic_functions.cpp b/dbms/src/Functions/tests/gtest_arithmetic_functions.cpp
@@ -103,8 +103,6 @@ class TestBinaryArithmeticFunctions : public DB::tests::FunctionTest
     }
 };
 
-<<<<<<< HEAD
-=======
 template <typename TYPE>
 void doTiDBDivideDecimalRoundInternalTest()
 {
@@ -241,7 +239,6 @@ try
 }
 CATCH
 
->>>>>>> c6d55aff39 (fix(expr): round decimal divide result when return type is Int512 (#7035))
 TEST_F(TestBinaryArithmeticFunctions, TiDBDivideDecimal)
 try
 {