fixed merge conflicts

2021-02-17 10:33:19 +01:00
parent b48798c5c5 a17b6ffcce
commit 9963d42a3e
9 changed files with 285 additions and 23 deletions
--- a/mission/devices/PDU1Handler.cpp
+++ b/mission/devices/PDU1Handler.cpp
@ -15,7 +15,6 @@ ReturnValue_t PDU1Handler::buildNormalDeviceCommand(
        DeviceCommandId_t * id) {
    *id = GOMSPACE::REQUEST_HK_TABLE;
    return buildCommandFromCommand(*id, NULL, 0);
-    return RETURN_OK;
 }

 void PDU1Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {