From f2190f8aa1fc0103681d62a7f6d9e94b00e51c28 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sat, 20 Aug 2022 12:24:24 +0200
Subject: [PATCH] resolve merge conflict

---
 linux/devices/ploc/PlocMPSoCHandler.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp
index a0fd8f53..c56ada07 100644
--- a/linux/devices/ploc/PlocMPSoCHandler.cpp
+++ b/linux/devices/ploc/PlocMPSoCHandler.cpp
@@ -685,11 +685,7 @@ ReturnValue_t PlocMPSoCHandler::handleCamCmdRpt(const uint8_t* data) {
       reinterpret_cast<const char*>(dataFieldPtr),
       tmCamCmdRpt.rememberSpacePacketSize - mpsoc::SPACE_PACKET_HEADER_SIZE - sizeof(uint16_t) - 3);
 #if OBSW_DEBUG_PLOC_MPSOC == 1
-<<<<<<< HEAD
-  uint8_t ackValue = *(packetReader.getPacketData() + packetReader.getPacketDataLen() - 2);
-=======
   uint8_t ackValue = *(packetReader.getFullData() + packetReader.getFullPacketLen() - 2);
->>>>>>> 9eb21079 (fix)
   sif::info << "PlocMPSoCHandler: CamCmdRpt message: " << camCmdRptMsg << std::endl;
   sif::info << "PlocMPSoCHandler: CamCmdRpt Ack value: 0x" << std::hex
             << static_cast<unsigned int>(ackValue) << std::endl;