Update pom.xml

pingcap · Jul 27, 2023 · 6d7d727 · 6d7d727
1 parent 815e00b
commit 6d7d727
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tikv-client/pom.xml b/tikv-client/pom.xml
@@ -23,12 +23,7 @@
         <grpc.version>1.29.0</grpc.version>
         <powermock.version>1.6.6</powermock.version>
         <jackson.annotations.version>2.12.6</jackson.annotations.version>
-<<<<<<< HEAD
         <jackson.databind.version>2.12.6.1</jackson.databind.version>
-        <trove4j.version>3.0.1</trove4j.version>
-=======
-        <jackson.databind.version>2.12.7.1</jackson.databind.version>
->>>>>>> 1fd6538a9 (delete trove4j (#2732))
         <jetcd.version>0.4.1</jetcd.version>
         <joda-time.version>2.9.9</joda-time.version>
         <joda-convert.version>1.9.2</joda-convert.version>