diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/main/java/com/google/protobuf/Descriptors.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/Descriptors.java b/java/src/main/java/com/google/protobuf/Descriptors.java index 0d5e47d1..df934bb4 100644 --- a/java/src/main/java/com/google/protobuf/Descriptors.java +++ b/java/src/main/java/com/google/protobuf/Descriptors.java @@ -1111,7 +1111,6 @@ public final class Descriptors { * For internal use only. This is to satisfy the FieldDescriptorLite * interface. */ - @Override public MessageLite.Builder internalMergeFrom( MessageLite.Builder to, MessageLite from) { // FieldDescriptors are only used with non-lite messages so we can just |