fixed merge conflicts

linux/uart/UartComIF.cpp

@@ -363,6 +363,9 @@ ReturnValue_t UartComIF::readReceivedMessage(CookieIF *cookie,
 	*buffer = uartDeviceMapIter->second.replyBuffer.data();
 	*size = uartDeviceMapIter->second.replyLen;
 
+	/* Length is reset to 0 to prevent reading the same data twice */
+	uartDeviceMapIter->second.replyLen = 0;
+
 	return RETURN_OK;
 }