rebase fixes

yontyon · yontyon · commit c411681c004a · 2023-03-28T10:23:15.000Z
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
 
 
