diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-04-13 09:56:17 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-04-13 09:56:17 -0700 |
| commit | a41fd5b0861f01a7be447eb3abfd903a6f623fa8 (patch) | |
| tree | a2b268872d24c80fc894d0441a2e5af084c47209 /src/node/test | |
| parent | 4d0ee2a56b71b3eae4865c6440362daebba0b5f7 (diff) | |
| parent | e48dd23092a58c76a1cb486846fbeea38f60af3e (diff) | |
Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4
Diffstat (limited to 'src/node/test')
| -rw-r--r-- | src/node/test/test_messages.proto | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/test/test_messages.proto b/src/node/test/test_messages.proto index ae70f6e152..43c213dabb 100644 --- a/src/node/test/test_messages.proto +++ b/src/node/test/test_messages.proto @@ -57,4 +57,4 @@ enum TestEnum { message EnumValues { TestEnum enum_value = 1; -}
\ No newline at end of file +} |