summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/moonlander/moonlander.c5
-rw-r--r--keyboards/planck/ez/ez.c13
2 files changed, 0 insertions, 18 deletions
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index c1e858a00d..cb8a5abca0 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -85,11 +85,6 @@ void moonlander_led_task(void) {
layer_state_set_kb(layer_state);
}
#endif
-#if !defined(MOONLANDER_USER_LEDS)
- else {
- layer_state_set_kb(layer_state);
- }
-#endif
}
static THD_WORKING_AREA(waLEDThread, 128);
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 26dbc64d01..c29f3cfa00 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -106,23 +106,10 @@ led_config_t g_led_config = { {
1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1
} };
-<<<<<<< HEAD
-void suspend_power_down_kb(void) {
- rgb_matrix_set_color_all(0, 0, 0);
- rgb_matrix_set_suspend_state(true);
- suspend_power_down_user();
-}
-
- void suspend_wakeup_init_kb(void) {
- rgb_matrix_set_suspend_state(false);
- suspend_wakeup_init_user();
-}
void keyboard_post_init_kb(void) {
rgb_matrix_enable_noeeprom();
keyboard_post_init_user();
}
-=======
->>>>>>> qmk/master
#endif
/* Left B9 Right B8 */