From e804d433aa92974596242857df98c08f9bf933fd Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 26 Aug 2022 13:46:18 +0200
Subject: [PATCH] merge conflict

---
 mission/devices/GomspaceDeviceHandler.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp
index e17855fe..0046a119 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/devices/GomspaceDeviceHandler.cpp
@@ -448,7 +448,6 @@ ReturnValue_t GomspaceDeviceHandler::generateRequestFullTableCmd(SpecialRequestT
   } else {
     RequestFullTableCommand requestFullTableCommand(querySize, tableId);
 
-<<<<<<< HEAD
     size_t cspPacketLen = 0;
     uint8_t* buffer = cspPacket;
     ReturnValue_t result = requestFullTableCommand.serialize(
@@ -461,17 +460,6 @@ ReturnValue_t GomspaceDeviceHandler::generateRequestFullTableCmd(SpecialRequestT
     }
     rawPacket = cspPacket;
     rawPacketLen = cspPacketLen;
-=======
-  size_t cspPacketLen = 0;
-  uint8_t* buffer = cspPacket;
-  ReturnValue_t result = requestFullTableCommand.serialize(
-      &buffer, &cspPacketLen, sizeof(cspPacket), SerializeIF::Endianness::BIG);
-  if (result != returnvalue::OK) {
-    sif::error << "GomspaceDeviceHandler::generateRequestFullHkTableCmd Failed to serialize "
-                  "full table request command "
-               << std::endl;
-    return result;
->>>>>>> origin/develop
   }
 
   rememberRequestedSize = querySize;