resolved merge conflicts

This commit is contained in:
2021-01-14 11:31:26 +01:00
parent f05af8f54a
commit a5e20657c6
2 changed files with 0 additions and 56 deletions

View File

@ -5,7 +5,6 @@ target_sources(${LIB_FSFW_NAME}
Service17Test.cpp
Service1TelecommandVerification.cpp
Service2DeviceAccess.cpp
Service3Housekeeping.cpp
Service5EventReporting.cpp
Service8FunctionManagement.cpp
Service9TimeManagement.cpp