aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/src/test/java/com/google/protobuf/test_bad_identifiers.proto6
1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto b/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
index 5cc42af8..499f099f 100644
--- a/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
+++ b/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
@@ -57,7 +57,11 @@ message Deprecated {
}
message Override {
- optional int32 override = 1;
+ optional int32 override = 1;
+}
+
+message Object {
+ optional int32 object = 1;
}
service TestConflictingMethodNames {