commit f8a4a6880ec6453c5a9427a240169e917eacd3a3
author Mike Kruskal <mkruskal@google.com> Mon May 20 20:54:19 2024 -0700
committer Mike Kruskal <mkruskal@google.com> Mon May 20 20:54:19 2024 -0700
tree 9b14f297468bf80b5a2fa5d80a8ba4d3a54246b5
parent c3417f582fd3d1f825bde4edfd9dc8a9fb3ba65c

Fix whitespace merge issue in gencode

src/google/protobuf/descriptor.pb.cc

diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
index f38f118..fd2c1f2 100644
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
@@ -10447,11 +10447,13 @@
       total_size +=
           1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.features_);
     }
+
     // optional .google.protobuf.FieldOptions.FeatureSupport feature_support = 4;
     if (cached_has_bits & 0x00000002u) {
       total_size +=
           1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.feature_support_);
     }
+
     // optional bool deprecated = 1 [default = false];
     if (cached_has_bits & 0x00000004u) {
       total_size += 2;