Resolved conflicts

Author: Gazizonoki

tests/unit/library/diff/CMakeLists.txt

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:tests/unit/library/diff/CMakeLists.txt
-add_ydb_test(NAME library-diff_ut
-=======
 add_ydb_test(NAME diff-ut
->>>>>>> 740dcae8d (Returned library and switched client to ol util and library):tests/library/diff/CMakeLists.txt
   SOURCES
     ut.cpp
   INCLUDE_DIRS

tests/unit/library/json/CMakeLists.txt

@@ -9,13 +9,9 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-<<<<<<< HEAD:tests/unit/library/json/CMakeLists.txt
-    library-json
+    json
 LABELS
     unit
-=======
-    json
->>>>>>> 740dcae8d (Returned library and switched client to ol util and library):tests/library/json/CMakeLists.txt
 )
 
 add_ydb_test(NAME json-ut-json_reader_fast_ut
@@ -30,13 +26,9 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-<<<<<<< HEAD:tests/unit/library/json/CMakeLists.txt
-    library-json
+    json
 LABELS
     unit
-=======
-    json
->>>>>>> 740dcae8d (Returned library and switched client to ol util and library):tests/library/json/CMakeLists.txt
 )
 
 add_ydb_test(NAME json-ut-json_reader_ut
@@ -50,13 +42,9 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-<<<<<<< HEAD:tests/unit/library/json/CMakeLists.txt
-    library-json
+    json
 LABELS
     unit
-=======
-    json
->>>>>>> 740dcae8d (Returned library and switched client to ol util and library):tests/library/json/CMakeLists.txt
 )
 
 add_ydb_test(NAME json-ut-json_saveload_ut
@@ -70,13 +58,9 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-<<<<<<< HEAD:tests/unit/library/json/CMakeLists.txt
-    library-json
+    json
 LABELS
     unit
-=======
-    json
->>>>>>> 740dcae8d (Returned library and switched client to ol util and library):tests/library/json/CMakeLists.txt
 )
 
 add_ydb_test(NAME json-ut-json_writer_ut
@@ -89,11 +73,7 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-<<<<<<< HEAD:tests/unit/library/json/CMakeLists.txt
-    library-json
+    json
 LABELS
     unit
-=======
-    json
->>>>>>> 740dcae8d (Returned library and switched client to ol util and library):tests/library/json/CMakeLists.txt
 )

tests/unit/library/yql/CMakeLists.txt

@@ -16,13 +16,9 @@ add_ydb_test(NAME yql-public-issue_ut
   yutil
   cpp-testing-unittest_main
   yql-public-issue
-<<<<<<< HEAD:tests/unit/library/yql/CMakeLists.txt
-  unicode_normalization
+  unicode-normalization
   LABELS
   unit
-=======
-  unicode-normalization
->>>>>>> 740dcae8d (Returned library and switched client to ol util and library):tests/library/yql/CMakeLists.txt
 )
 
 add_ydb_test(NAME yql-public-decimal_ut