solved all merge conflicts

2021-03-22 13:09:06 +01:00
parent 862a546637
commit e44773fee3
8 changed files with 158 additions and 54 deletions
--- a/linux/gpio/LinuxLibgpioIF.cpp
+++ b/linux/gpio/LinuxLibgpioIF.cpp
@ -88,12 +88,8 @@ ReturnValue_t LinuxLibgpioIF::configureRegularGpio(gpioId_t gpioId, GpiodRegular
    lineNum = regularGpio->lineNum;
    lineHandle = gpiod_chip_get_line(chip, lineNum);
    if (!lineHandle) {
-<<<<<<< HEAD
        sif::error << "LinuxLibgpioIF::configureGpios: Failed to open line for GPIO with id "
                    << gpioId << std::endl;
-=======
-        sif::error << "LinuxLibgpioIF::configureGpios: Failed to open line" << std::endl;
->>>>>>> develop
        gpiod_chip_close(chip);
        return RETURN_FAILED;
    }