Resolve conflict

ydb-platform · Jan 29, 2024 · 2ea3bb2 · 2ea3bb2
1 parent 141ca92
commit 2ea3bb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/library/cpp/monlib/counters/counters.h b/library/cpp/monlib/counters/counters.h
@@ -3,11 +3,8 @@
 #include <list>
 #include <util/datetime/base.h>
 #include <util/generic/algorithm.h>
-<<<<<<< HEAD
-#include <util/generic/map.h>
-=======
+
 #include <util/generic/list.h>
->>>>>>> f76958d9b3 (Replace TMap/TMultiMap to std::map/std::multimap)
 #include <util/generic/ptr.h>
 #include <util/generic/singleton.h>
 #include <util/generic/vector.h>

diff --git a/util/ysaveload_ut.cpp b/util/ysaveload_ut.cpp
@@ -5,11 +5,8 @@
 #include <util/memory/pool.h>
 #include <util/stream/buffer.h>
 #include <util/memory/blob.h>
-<<<<<<< HEAD
-#include <util/generic/map.h>
-=======
+
 #include <util/generic/list.h>
->>>>>>> f76958d9b3 (Replace TMap/TMultiMap to std::map/std::multimap)
 #include <util/generic/hash_multi_map.h>
 #include <util/generic/deque.h>
 #include <util/generic/string.h>