Merge pull request #1 from hongyunyan/cherry-pick-5166-to-release-6.0

fix merge master error
ti-chi-bot · Jun 23, 2022 · c6910c2 · c6910c2
2 parents f1415ef + 3888044
commit c6910c2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/dbms/src/Storages/Transaction/TiDB.cpp b/dbms/src/Storages/Transaction/TiDB.cpp
@@ -612,11 +612,8 @@ catch (const Poco::Exception & e)
 ///////////////////////
 
 IndexColumnInfo::IndexColumnInfo(Poco::JSON::Object::Ptr json)
-<<<<<<< HEAD
-=======
     : length(0)
     , offset(0)
->>>>>>> 18325f9eb4 (DDL: Use Column Name Instead of Offset to Find the common handle cluster index (#5166))
 {
     deserialize(json);
 }