Fix compilation issues

2022-03-25 16:31:52 -07:00
parent 53ff570bf0
commit 07a3743e87
6 changed files with 2 additions and 59 deletions
@@ -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 */