diff options
| author | Xiao Hang <rocking@google.com> | 2015-07-29 15:12:10 -0700 |
|---|---|---|
| committer | Xiao Hang <rocking@google.com> | 2015-08-04 14:30:39 -0700 |
| commit | ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a (patch) | |
| tree | ff110a2a652a0bf29be8c9edfcb7dec151bfe7c7 /javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto | |
| parent | 801e92007fd6eac3fa5b4c386ba54089393680c7 (diff) | |
| parent | c3e6493aa43241688a307162f3417c176f3c0d4f (diff) | |
| download | protobuf-ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a.tar.gz protobuf-ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a.tar.bz2 protobuf-ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a.zip | |
Merge branch 'master' of https://github.com/zsurocking/protobuf
Diffstat (limited to 'javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto')
| -rw-r--r-- | javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto index 9bfc3ad1..ef4e2d2f 100644 --- a/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto +++ b/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto @@ -34,7 +34,7 @@ package protobuf_unittest; import "google/protobuf/nano/unittest_nano.proto"; -option java_package = "com.google.protobuf.nano"; +option java_package = "com.google.protobuf"; option java_multiple_files = true; // A container message for testing the merging of repeated fields at a |