From a2a0c3c118640367803dac98e3b92c4b410b6b3b Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Fri, 22 Apr 2022 17:18:36 +0000
Subject: [PATCH] Fixed some mis-merged files.

---
 .../main/java/com/google/protobuf/jruby/RubyDescriptor.java   | 4 ++--
 ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java b/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
index c09fe92ab..b80925331 100644
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
+++ b/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
-        klass.searchMethod("respond_to?").setIsBuiltin(false);
+    // Workaround for https://github.com/jruby/jruby/issues/7154
+    klass.searchMethod("respond_to?").setIsBuiltin(false);
     return klass;
   }
 
diff --git a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
index 1e949a539..301b95798 100644
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
+++ b/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(