From c411681c004ad7fb11eed8843f990780e282330a Mon Sep 17 00:00:00 2001
From: Yehonatan Buchnik <yontyon@gmail.com>
Date: Tue, 28 Mar 2023 10:23:15 +0000
Subject: [PATCH] rebase fixes

---
 libs/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 6176499fb8..f275d2b54c 100644
--- 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