Fixed some mis-merged files.

ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java

@@ -215,8 +215,8 @@ public class RubyDescriptor extends RubyObject {
     klass.include(new IRubyObject[] {messageExts});
     klass.instance_variable_set(runtime.newString(Utils.DESCRIPTOR_INSTANCE_VAR), this);
     klass.defineAnnotatedMethods(RubyMessage.class);
-        // Workaround for https://github.com/jruby/jruby/issues/7154
+    // Workaround for https://github.com/jruby/jruby/issues/7154
-        klass.searchMethod("respond_to?").setIsBuiltin(false);
+    klass.searchMethod("respond_to?").setIsBuiltin(false);
     return klass;
   }
 

ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java

@@ -860,7 +860,6 @@ public class RubyMessage extends RubyObject {
               this.builder.getDescriptorForType().findFieldByName(TYPE);
           if (typeBytesSymbol.equals(fields.get(enumFieldDescriptorForType))) {
             isDefaultStringForBytes = true;
-                    }
           }
         }
         builder.setField(