From f000b7e18fd6921ca02ea4b87608e8cadcb7b64f Mon Sep 17 00:00:00 2001
From: Sandy Zhang <sandyzhang@google.com>
Date: Wed, 18 Sep 2024 14:57:16 -0400
Subject: [PATCH] Fix merge conflict by adding optional label to proto2
 unittest_lite.proto

---
 src/google/protobuf/unittest_lite.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/google/protobuf/unittest_lite.proto b/src/google/protobuf/unittest_lite.proto
index 2402cbe03391..c7fe54eb2dff 100644
--- 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];
 }