Fix merge conflict

2 years ago · 3304c89726
parent 2a193db712
commit 3304c89726
1 changed files with 0 additions and 4 deletions
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@ -76,11 +76,7 @@
        <dependency>
          <groupId>com.google.protobuf</groupId>
          <artifactId>protobuf-java-util</artifactId>
-<<<<<<< HEAD
-          <version>3.21.12</version>
-=======
          <version>3.22.1</version>
->>>>>>> upstream/22.x
        </dependency>
        <dependency>
            <groupId>org.jruby</groupId>