fixed merge conflicts

2021-12-14 19:57:35 +01:00
parent 58074f9bfd 9983acf98b
commit 5067519b8a
23 changed files with 283 additions and 240 deletions
--- a/linux/devices/CMakeLists.txt
+++ b/linux/devices/CMakeLists.txt
@ -1,5 +1,4 @@
 target_sources(${TARGET_NAME} PRIVATE
-	HeaterHandler.cpp
 	SolarArrayDeploymentHandler.cpp
 	SusHandler.cpp
 )