From 9968ed9a22d5e31b24ae3b0b11f4babceb9ab68c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 25 Oct 2025 22:17:13 +0200
Subject: [PATCH] fix merge error

---
 wled00/colors.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 07d4020f..23151ecb 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -100,7 +100,8 @@ IRAM_ATTR_YN __attribute__((hot)) uint32_t color_fade(uint32_t c1, uint8_t amoun
   uint32_t rb = (((c1 & TWO_CHANNEL_MASK) * amount) >> 8) &  TWO_CHANNEL_MASK; // scale red and blue
   uint32_t wg = (((c1 >> 8) & TWO_CHANNEL_MASK) * amount) & ~TWO_CHANNEL_MASK; // scale white and green
   return (rb | wg) + addRemains;
-}#endif
+}
+#endif
 
 void setRandomColor(byte* rgb)
 {