1 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad2fca5..495420d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,13 @@
 cmake_minimum_required(VERSION 3.13)
 
+<<<<<<< HEAD
+set(SOURCE_FILES
+src/main.cpp
+src/Game/edit.cpp
+src/Game/display.cpp
+src/Game/init.cpp
+src/Utils/catch.cpp
+=======
 project(minesweeper LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -8,6 +16,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp"
+>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d
 )
 
 add_executable(minesweeper)