From b3dd2ec57a46cfa8d975e6bc450fdf82e5cde6f6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 21 Feb 2023 11:11:10 +0100
Subject: [PATCH] merge conflict

---
 linux/devices/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt
index 99556957..17d842ea 100644
--- a/linux/devices/CMakeLists.txt
+++ b/linux/devices/CMakeLists.txt
@@ -2,7 +2,7 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
   target_sources(${OBSW_NAME} PRIVATE GpsHyperionLinuxController.cpp)
 endif()
 
-<<<<<<< HEAD
+target_sources(
   ${OBSW_NAME} PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp ImtqPollingTask.cpp
                        ScexDleParser.cpp ScexHelper.cpp RwPollingTask.cpp)