diff options
| author |  temporal <temporal@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-01 07:37:11 +0000 |
|---|---|---|
| committer | temporal <temporal@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-01 07:37:11 +0000 |
| commit | 43af40dccab2f11409708ca4f20fbe24dcf12681 (patch) | |
| tree | 274dd2550db93fc5f06cc99931da170ff3a2c18a /java/src | |
| parent | f837b0066d7118c143c0301634e1d713bb1dc893 (diff) | |
Remove @Override annotations that cause compiler errors on Java 1.5.
Diffstat (limited to 'java/src')
| -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 |