Resolve conflicts.

1 year ago · 4040e13a7b
parent fb761f7ebb
commit 4040e13a7b
1 changed files with 2 additions and 2 deletions
--- a/ruby/tests/stress.proto
+++ b/ruby/tests/stress.proto
@ -3,10 +3,10 @@ syntax = "proto3";
 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;
 }