Merge remote-tracking branch 'origin/master' into develop

2021-09-05 20:37:03 +00:00
parent 673f82ebd9 8d6d8cfadf
commit 147289e173
485 changed files with 187 additions and 8517 deletions
--- a/keyboards/alpha/keymaps/default/keymap.c
+++ b/keyboards/alpha/keymaps/default/keymap.c
@@ -41,9 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_NO, KC_NO, KC_NO, TO(0), MACRO1, KC_NO, KC_NO, KC_NO),
 };
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}