aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/protobuf/util/merge.h
diff options
context:
space:
mode:
authoryazevnul <yazevnul@yandex-team.ru>2022-02-10 16:46:46 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:46 +0300
commit8cbc307de0221f84c80c42dcbe07d40727537e2c (patch)
tree625d5a673015d1df891e051033e9fcde5c7be4e5 /library/cpp/protobuf/util/merge.h
parent30d1ef3941e0dc835be7609de5ebee66958f215a (diff)
downloadydb-8cbc307de0221f84c80c42dcbe07d40727537e2c.tar.gz
Restoring authorship annotation for <yazevnul@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/protobuf/util/merge.h')
-rw-r--r--library/cpp/protobuf/util/merge.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/library/cpp/protobuf/util/merge.h b/library/cpp/protobuf/util/merge.h
index 924975f141..4acea08697 100644
--- a/library/cpp/protobuf/util/merge.h
+++ b/library/cpp/protobuf/util/merge.h
@@ -1,14 +1,14 @@
#pragma once
-namespace google {
- namespace protobuf {
- class Message;
- }
-}
+namespace google {
+ namespace protobuf {
+ class Message;
+ }
+}
-namespace NProtoBuf {
- using Message = ::google::protobuf::Message;
-}
+namespace NProtoBuf {
+ using Message = ::google::protobuf::Message;
+}
namespace NProtoBuf {
// Similiar to Message::MergeFrom, overwrites existing repeated fields