fixed conflicts
This commit is contained in:
@ -1,6 +1,5 @@
|
||||
target_sources(${OBSW_NAME} PRIVATE
|
||||
SolarArrayDeploymentHandler.cpp
|
||||
SusHandler.cpp
|
||||
GPSHyperionLinuxController.cpp
|
||||
)
|
||||
|
||||
add_subdirectory(startracker)
|
Reference in New Issue
Block a user