Fix merge conflict by adding optional label to proto2 unittest_lite.p…

…roto
protocolbuffers · Sep 18, 2024 · f000b7e · f000b7e
1 parent 4728531
commit f000b7e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/google/protobuf/unittest_lite.proto b/src/google/protobuf/unittest_lite.proto
@@ -508,5 +508,5 @@ message RecursiveMessage {
 }
 
 message RecursiveGroup {
-  RecursiveGroup recurse = 1 [features.message_encoding = DELIMITED];
+  optional RecursiveGroup recurse = 1 [features.message_encoding = DELIMITED];
 }