From 35f2d2cb9cb5c6df84ca782c5d86c44c4c1fd004 Mon Sep 17 00:00:00 2001
From: Irini Kosmidou <st155836@stud.uni-stuttgart.de>
Date: Fri, 8 Apr 2022 15:25:07 +0200
Subject: [PATCH] solve merge comflioct

---
 linux/devices/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt
index b88d59fc..b8568560 100644
--- a/linux/devices/CMakeLists.txt
+++ b/linux/devices/CMakeLists.txt
@@ -4,11 +4,8 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
     )
 endif()
 
-<<<<<<< HEAD
 target_sources(${OBSW_NAME} PRIVATE
 	ScexUartReader.cpp
 )
-=======
 add_subdirectory(ploc)
->>>>>>> origin/develop
 add_subdirectory(startracker)