fixup! build(deps): bump com.google.protobuf:protobuf-java (#500)

cryostatio · Oct 2, 2024 · 4759579 · 4759579
1 parent d4cdcf1
commit 4759579
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,13 +86,8 @@
   <io.smallrye.config.version>3.4.3</io.smallrye.config.version>
   <org.slf4j.version>2.0.12</org.slf4j.version>
   <org.projectnessie.cel.bom.version>0.4.4</org.projectnessie.cel.bom.version>
-<<<<<<< HEAD
-  <com.google.protobuf-java.version>3.25.2</com.google.protobuf-java.version>
-  <info.picocli.version>4.7.4</info.picocli.version>
-=======
   <com.google.protobuf-java.version>3.25.5</com.google.protobuf-java.version>
-  <info.picocli.version>4.7.6</info.picocli.version>
->>>>>>> b9a810b (build(deps): bump com.google.protobuf:protobuf-java (#500))
+  <info.picocli.version>4.7.4</info.picocli.version>
   <com.redhat.insights.agent.version>1.0.2</com.redhat.insights.agent.version>
 
   <com.github.spotbugs.version>4.8.5</com.github.spotbugs.version>