fixes for te0720 build

2022-06-08 07:16:12 +02:00
parent 8c850614e5
commit 1ebae7f938
9 changed files with 284 additions and 132 deletions
--- a/mission/utility/CMakeLists.txt
+++ b/mission/utility/CMakeLists.txt
@ -1,12 +1,5 @@
-<<<<<<< HEAD
 target_sources(${LIB_EIVE_MISSION} PRIVATE
 	Timestamp.cpp
 	ProgressPrinter.cpp
 	Filenaming.cpp
 )
-
-
-=======
-target_sources(${LIB_EIVE_MISSION} PRIVATE TmFunnel.cpp Timestamp.cpp
-                                           ProgressPrinter.cpp Filenaming.cpp)
->>>>>>> meier/thermal-controller-fix