Restoring authorship annotation for Anton Samokhvalov <pg83@yandex.ru>. Commit 2 of 2.

1 files changed, 7 insertions, 7 deletions

diff --git a/library/cpp/protobuf/util/merge.h b/library/cpp/protobuf/util/merge.h
index b354331788..924975f141 100644
--- a/library/cpp/protobuf/util/merge.h
+++ b/library/cpp/protobuf/util/merge.h
@@ -11,12 +11,12 @@ namespace NProtoBuf {
 }
 
 namespace NProtoBuf {
-    // Similiar to Message::MergeFrom, overwrites existing repeated fields 
-    // and embedded messages completely instead of recursive merging. 
-    void RewriteMerge(const Message& src, Message& dst); 
+    // Similiar to Message::MergeFrom, overwrites existing repeated fields
+    // and embedded messages completely instead of recursive merging.
+    void RewriteMerge(const Message& src, Message& dst);
 
-    // Does standard MergeFrom() by default, except messages/fields marked with DontMerge or DontMergeField option. 
-    // Such fields are merged using RewriteMerge() (i.e. destination is cleared before merging anything from source) 
-    void CustomMerge(const Message& src, Message& dst); 
+    // Does standard MergeFrom() by default, except messages/fields marked with DontMerge or DontMergeField option.
+    // Such fields are merged using RewriteMerge() (i.e. destination is cleared before merging anything from source)
+    void CustomMerge(const Message& src, Message& dst);
 
-} 
+}