eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 4 Pull Requests 2 Releases 119 Wiki Activity

solve merge comflioct
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Irini Kosmidou 2022-04-08 15:25:07 +02:00
parent 188f8863d0
commit 35f2d2cb9c
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux/devices/CMakeLists.txt
View File

@ -4,11 +4,8 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
) )
endif() endif()
<<<<<<< HEAD
target_sources(${OBSW_NAME} PRIVATE target_sources(${OBSW_NAME} PRIVATE
ScexUartReader.cpp ScexUartReader.cpp
) )
=======
add_subdirectory(ploc) add_subdirectory(ploc)
>>>>>>> origin/develop
add_subdirectory(startracker) add_subdirectory(startracker)