fixed merge conflicts

2022-06-06 10:30:17 +02:00
parent 2fa4fd61d0 c7cf8e710d
commit 161dbde0d7
120 changed files with 3886 additions and 1334 deletions
--- a/tests/src/fsfw_tests/unit/CMakeLists.txt
+++ b/tests/src/fsfw_tests/unit/CMakeLists.txt
@ -11,7 +11,10 @@ target_sources(${FSFW_TEST_TGT} PRIVATE
 )

 add_subdirectory(testcfg)
+add_subdirectory(mocks)
+
 add_subdirectory(action)
+add_subdirectory(power)
 add_subdirectory(container)
 add_subdirectory(osal)
 add_subdirectory(serialize)