| commit | 4040e13a7bc1c183b7e57073f070ea13518122c0 | [log] [tgz] |
|---|---|---|
| author | Jason Lunn <jason.lunn@gmail.com> | Wed Jan 03 17:08:05 2024 -0500 |
| committer | Jason Lunn <jason.lunn@gmail.com> | Wed Jan 03 17:08:05 2024 -0500 |
| tree | 7a30ab00a1992446a85cae4f7606471112a52c60 | |
| parent | fb761f7ebb8ee8898fd872c0d94e82df11e9b97f [diff] |
Resolve conflicts.
diff --git a/ruby/tests/stress.proto b/ruby/tests/stress.proto index 517e746..e7a0042 100644 --- a/ruby/tests/stress.proto +++ b/ruby/tests/stress.proto
@@ -3,10 +3,10 @@ package stress_test_protos; message TestMessage { - int32 a = 1; + optional int32 a = 1; repeated M b = 2; } message M { - string foo = 1; + optional string foo = 1; }