rebase fixes

vmware · Mar 28, 2023 · c411681 · c411681
1 parent 36a3399
commit c411681
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -5,10 +5,7 @@ add_subdirectory(util)
 add_subdirectory(crypto)
 add_subdirectory(secrets)
 add_subdirectory(communication)
-<<<<<<< HEAD
 add_subdirectory(reconfiguration)
-=======
 add_subdirectory(storage)
->>>>>>> Move storage to libs