Fix CMakeLists.txt blunder, take #1

CMakeLists.txt

@@ -15,34 +15,19 @@ add_custom_target(check
 
 # Specify the .cpp files for the executables
 add_executable(ecss_services src/main.cpp src/Message.cpp src/Service.cpp
-<<<<<<< CMakeLists.txt
-        src/Services/TestService.cpp 
-        src/Services/RequestVerificationService.cpp
-        src/Services/MemoryManagementService.cpp
-        src/Services/ParameterService.cpp)
-=======
-        src/Services/TestService.cpp
-        src/Services/RequestVerificationService.cpp)
->>>>>>> CMakeLists.txt
+    src/Services/TestService.cpp src/Services/RequestVerificationService.cpp
+    src/Services/MemoryManagementService.cpp src/Services/ParameterService.cpp
+    src/Services/TestService.cpp
+    src/Services/RequestVerificationService.cpp)
 
 IF(EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
     add_subdirectory(lib/Catch2)
-    add_executable(tests src/Message.cpp src/Services/TestService.cpp
-<<<<<<< CMakeLists.txt
-            src/Services/RequestVerificationService.cpp 
-            src/Services/ParameterService.cpp
-            src/Services/MemoryManagementService.cpp
-            test/tests.cpp
-            test/Message.cpp 
-            test/TestPlatform.cpp 
-            test/Services/TestService.cpp
-            test/Services/RequestVerificationService.cpp
-            test/Services/ParameterService.cpp
-            test/Services/MemoryManagementService.cpp)
-=======
-    src/Services/RequestVerificationService.cpp
-    test/tests.cpp test/Message.cpp test/TestPlatform.cpp test/Services/TestService.cpp
-    test/Services/RequestVerificationService.cpp)
->>>>>>> CMakeLists.txt
+    add_executable(tests src/Message.cpp src/Services/TestService.cpp 
+    src/Services/RequestVerificationService.cpp src/Services/ParameterService.cpp 
+    src/Services/MemoryManagementService.cpp test/tests.cpp test/Message.cpp 
+    test/TestPlatform.cpp test/Services/TestService.cpp 
+    test/Services/RequestVerificationService.cpp 
+    test/Services/ParameterService.cpp test/Services/MemoryManagementService.cpp)
+
     target_link_libraries(tests Catch2::Catch2)
 ENDIF()