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<int>(requestLen)) {
 #if FSFW_VERBOSE_LEVEL >= 1 and FSFW_CPP_OSTREAM_ENABLED == 1
-=======
-    if (readLen != static_cast<int>(requestLen)) {
->>>>>>> Stashed changes
         sif::error << "I2cComIF::requestReceiveMessage: Reading from I2C "
                 << "device failed with error code " << errno <<". Description"
                 << " of error: " << strerror(errno) << std::endl;