Fixed some mis-merged files.

3 years ago · a2a0c3c118
parent f80137c46d
commit a2a0c3c118
2 changed files with 2 additions and 3 deletions
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
+++ b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
@ -862,7 +862,6 @@ public class RubyMessage extends RubyObject {
            isDefaultStringForBytes = true;
          }
        }
        }
        builder.setField(
            fieldDescriptor,
            convert(