aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/protobuf/util/proto/merge.proto
diff options
context:
space:
mode:
authorkakabba <kakabba@yandex-team.ru>2022-02-10 16:46:04 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:04 +0300
commitc8e3995898c443e78266f7420aac5fb3da15d413 (patch)
treea530e068cc107e227deccc80722204db63a4d75d /library/cpp/protobuf/util/proto/merge.proto
parent110a978b66fe6c0916572df51cfead2a9b647174 (diff)
downloadydb-c8e3995898c443e78266f7420aac5fb3da15d413.tar.gz
Restoring authorship annotation for <kakabba@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/protobuf/util/proto/merge.proto')
-rw-r--r--library/cpp/protobuf/util/proto/merge.proto2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/cpp/protobuf/util/proto/merge.proto b/library/cpp/protobuf/util/proto/merge.proto
index a937041c07..51bbe80f1b 100644
--- a/library/cpp/protobuf/util/proto/merge.proto
+++ b/library/cpp/protobuf/util/proto/merge.proto
@@ -1,4 +1,4 @@
-import "google/protobuf/descriptor.proto";
+import "google/protobuf/descriptor.proto";
// These meta-options are used for selecting proper merging method, see merge.h