From 8dc5665d5d1e58fb6847438dc73c6a12e33d7c08 Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Sun, 10 Oct 2021 00:30:06 +0200
Subject: [PATCH] Forgot merge thingy

---
 main/settings.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/main/settings.h b/main/settings.h
index c7fc85f..6d92256 100644
--- 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