fix

pingcap · Oct 18, 2022 · 9c44602 · 9c44602
1 parent 663f681
commit 9c44602
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/dbms/src/Functions/FunctionsLogical.h b/dbms/src/Functions/FunctionsLogical.h
@@ -97,14 +97,10 @@ struct NotImpl
 {
     using ResultType = UInt8;
 
-<<<<<<< HEAD
-    static inline UInt8 apply(A a) { return !a; }
-=======
     static inline bool apply(A a)
     {
         return !a;
     }
->>>>>>> 1e0e3c8973 (fix inconsistent result before deleting some rows (#6133))
 };
 
 
@@ -183,14 +179,10 @@ struct AssociativeOperationImpl<Op, 1>
 
     AssociativeOperationImpl(UInt8ColumnPtrs & in) : vec(in[in.size() - 1]->getData()) {}
 
-<<<<<<< HEAD
-    inline UInt8 apply(size_t i) const { return vec[i]; }
-=======
     inline bool apply(size_t i) const
     {
         return vec[i];
     }
->>>>>>> 1e0e3c8973 (fix inconsistent result before deleting some rows (#6133))
 };