| commit | 3304c89726e3e4c5494dfab92ac02f8ca8755397 | [log] [tgz] |
|---|---|---|
| author | Deanna Garcia <deannagarcia@google.com> | Wed Mar 08 17:19:46 2023 +0000 |
| committer | Deanna Garcia <deannagarcia@google.com> | Wed Mar 08 17:19:46 2023 +0000 |
| tree | c61977006b8c95cb560f9bcf8f8a33e7debe668a | |
| parent | 2a193db7127a949599caaa567f0eef7f7648bbb2 [diff] |
Fix merge conflict
diff --git a/ruby/pom.xml b/ruby/pom.xml index cd2d68e..503d3af 100644 --- 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>