From 9d3346672184c81f95da5b477fa27c48831c5281 Mon Sep 17 00:00:00 2001
From: jepenven-silabs <jean-francois.penven@silabs.com>
Date: Fri, 14 Apr 2023 11:15:07 -0400
Subject: [PATCH] fix conflicts

---
 examples/platform/silabs/display/lcd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/platform/silabs/display/lcd.cpp b/examples/platform/silabs/display/lcd.cpp
index 561c02451686ee..11e5c7118b6cda 100644
--- a/examples/platform/silabs/display/lcd.cpp
+++ b/examples/platform/silabs/display/lcd.cpp
@@ -237,4 +237,4 @@ void SilabsLCD::LCDFillRect(uint8_t x, uint8_t y, uint8_t w, uint8_t h)
         }
     }
 }
-#endif // QR_CODE_ENABLED
+#endif // QR_CODE_ENABLED
\ No newline at end of file