fix ci

Signed-off-by: marsishandsome <marsishandsome@gmail.com>
tikv · Jan 20, 2022 · 84dff88 · 84dff88
1 parent 6f36b29
commit 84dff88
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/main/java/org/tikv/raw/SmartRawKVClient.java b/src/main/java/org/tikv/raw/SmartRawKVClient.java
@@ -23,11 +23,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tikv.common.exception.CircuitBreakerOpenException;
-<<<<<<< HEAD
-=======
 import org.tikv.common.util.HistogramUtils;
-import org.tikv.common.util.Pair;
->>>>>>> 4f0ec583... add metrics inside grpc and netty (#484)
 import org.tikv.common.util.ScanOption;
 import org.tikv.kvproto.Kvrpcpb;
 import org.tikv.service.failsafe.CircuitBreaker;