diff options
| author | prime <prime@yandex-team.ru> | 2022-02-10 16:46:00 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:00 +0300 |
| commit | 3695a7cd42b74a4987d8d5a8f2e2443556998943 (patch) | |
| tree | ee79ee9294a61ee00e647684b3700d0a87e102a3 /contrib/libs/protobuf/src | |
| parent | 4d8b546b89b5afc08cf3667e176271c7ba935f33 (diff) | |
| download | ydb-3695a7cd42b74a4987d8d5a8f2e2443556998943.tar.gz | |
Restoring authorship annotation for <prime@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'contrib/libs/protobuf/src')
| -rw-r--r-- | contrib/libs/protobuf/src/google/protobuf/descriptor.pb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libs/protobuf/src/google/protobuf/descriptor.pb.cc b/contrib/libs/protobuf/src/google/protobuf/descriptor.pb.cc index 2e91b7c1ab..6877463905 100644 --- a/contrib/libs/protobuf/src/google/protobuf/descriptor.pb.cc +++ b/contrib/libs/protobuf/src/google/protobuf/descriptor.pb.cc @@ -6863,7 +6863,7 @@ void FileOptions::MergeFrom(const FileOptions& from) { } if (cached_has_bits & 0x00020000u) { deprecated_ = from.deprecated_; - } + } if (cached_has_bits & 0x00040000u) { optimize_for_ = from.optimize_for_; } |