fix conflicts

project-chip · Apr 14, 2023 · 9d33466 · 9d33466
1 parent 8b83927
commit 9d33466
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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