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/linux/gpio/GpioIF.h
+++ b/linux/gpio/GpioIF.h
@ -40,7 +40,7 @@ public:
 	virtual ReturnValue_t pullLow(gpioId_t gpioId) = 0;

 	/**
-     * @brief   This function requires a child to implement the functionaliy to read the state of
+     * @brief   This function requires a child to implement the functionality to read the state of
     *          an ouput or input gpio.
     *
     * @param gpioId    A unique number which specifies the GPIO to read.