From 37dff77d7ec85eefef241e9107ae41ae520dddf6 Mon Sep 17 00:00:00 2001 From: "Jakob.Meier" Date: Mon, 21 Jun 2021 16:41:43 +0200 Subject: [PATCH] fixed merge conflict --- linux/i2c/I2cComIF.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/linux/i2c/I2cComIF.cpp b/linux/i2c/I2cComIF.cpp index 7abcd2c..aa336c7 100644 --- a/linux/i2c/I2cComIF.cpp +++ b/linux/i2c/I2cComIF.cpp @@ -147,13 +147,8 @@ ReturnValue_t I2cComIF::requestReceiveMessage(CookieIF *cookie, uint8_t* replyBuffer = i2cDeviceMapIter->second.replyBuffer.data(); int readLen = read(fd, replyBuffer, requestLen); -<<<<<<< Updated upstream - if (readLen != static_cast(requestLen)) { #if FSFW_VERBOSE_LEVEL >= 1 and FSFW_CPP_OSTREAM_ENABLED == 1 -======= - if (readLen != static_cast(requestLen)) { ->>>>>>> Stashed changes sif::error << "I2cComIF::requestReceiveMessage: Reading from I2C " << "device failed with error code " << errno <<". Description" << " of error: " << strerror(errno) << std::endl;