Saved changes.

Signed-off-by: Markuu-s <[email protected]>

Author: Markuu-s

CMakeLists.txt

@@ -113,7 +113,6 @@ include_directories(
     ${PROJECT_SOURCE_DIR}/libs
 )
 
-<<<<<<< Updated upstream
 if (BUILD_INTERNAL_DEPS)
   include_directories(
       SYSTEM
@@ -123,16 +122,6 @@ if (BUILD_INTERNAL_DEPS)
   )
 endif()
 
-=======
-include_directories(
-    SYSTEM
-    # system includes
-    deps/indicators/include
-    deps/libsecp256k1/include
-)
-
-add_subdirectory(core)
->>>>>>> Stashed changes
 add_subdirectory(libs)
 add_subdirectory(core)