diff options
author | 2017-04-14 21:16:19 +0200 | |
---|---|---|
committer | 2017-04-14 21:16:19 +0200 | |
commit | 8ff0d0d436b4fd9fd4199d313f708377c7a668af (patch) | |
tree | 1d0060d271adb3d6bac605c2a10768be80e09203 /third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto | |
parent | 5235d06159ba6fee412bee261ea7867d061252b0 (diff) |
Revert "protobuf: Update protobuf to @laszlocsomor's master at commit 421d909."
This reverts commit 5235d06159ba6fee412bee261ea7867d061252b0.
Unfortunately, we noticed several build errors / test failures internally due this
change.
Diffstat (limited to 'third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto')
-rw-r--r-- | third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto b/third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto deleted file mode 100644 index b31c43994c..0000000000 --- a/third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto +++ /dev/null @@ -1,41 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Author: maxtroy@google.com (Max Cai) - -package protobuf_unittest_import; - -option java_package = "com.google.protobuf"; -option java_outer_classname = "MultipleNameClashNano"; -option java_multiple_files = true; - -message MultipleNameClashNano { - optional int32 field = 1; -} |