Merge remote-tracking branch 'origin/develop' into heater_handling

2022-11-28 08:49:00 +01:00
parent 0484daac23 a20dce5a87
commit 46165f8166
2 changed files with 2 additions and 2 deletions
--- a/bsp_q7s/core/CMakeLists.txt
+++ b/bsp_q7s/core/CMakeLists.txt
@ -1,4 +1,4 @@
 target_sources(${OBSW_NAME} PRIVATE CoreController.cpp scheduling.cpp
                                    ObjectFactory.cpp)

-target_sources(${SIMPLE_OBSW_NAME} PRIVATE InitMission.cpp)
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE scheduling.cpp)
--- a/2
+++ b/2