Forgot merge thingy

2021-10-10 00:30:06 +02:00
parent 2c77b55275
commit 8dc5665d5d
1 changed files with 0 additions and 3 deletions
--- a/main/settings.h
+++ b/main/settings.h
@ -166,12 +166,9 @@ struct Settings
        bool enableStVO;
        int16_t stvoFrontOffset;
        int16_t stvoFrontLength;
-<<<<<<< HEAD
-=======
        bool stvoFrontEnable;
        int16_t animationMultiplier;
        uint8_t brightness;
->>>>>>> 3dff172 (Added led brightness and animation speed)
    } ledstrip;
 #endif