Update CommonHandle.java

pingcap · Dec 9, 2022 · 25edd44 · 25edd44
1 parent e671217
commit 25edd44
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tikv-client/src/main/java/com/pingcap/tikv/key/CommonHandle.java b/tikv-client/src/main/java/com/pingcap/tikv/key/CommonHandle.java
@@ -19,12 +19,7 @@
 import com.pingcap.tikv.codec.Codec;
 import com.pingcap.tikv.codec.CodecDataInput;
 import com.pingcap.tikv.codec.CodecDataOutput;
-<<<<<<< HEAD:tikv-client/src/main/java/com/pingcap/tikv/key/CommonHandle.java
 import com.pingcap.tikv.exception.CodecException;
-import com.pingcap.tikv.types.Converter;
-=======
-import com.pingcap.tikv.key.Key;
->>>>>>> 47d082c7c (Compatible with TiDB mater (v6.5.0) (#2598)):tikv-client/src/main/java/com/pingcap/tikv/handle/CommonHandle.java
 import com.pingcap.tikv.types.DataType;
 import com.pingcap.tikv.types.MySQLType;
 import com.pingcap.tikv.util.FastByteComparisons;