fixed conflicts

This commit is contained in:
Jakob Meier
2022-02-25 14:39:18 +01:00
62 changed files with 3851 additions and 1018 deletions

View File

@ -1,6 +1,5 @@
target_sources(${OBSW_NAME} PRIVATE
SolarArrayDeploymentHandler.cpp
SusHandler.cpp
GPSHyperionLinuxController.cpp
)
add_subdirectory(startracker)