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/org60/keymaps/default/keymap.c
+++ b/keyboards/org60/keymaps/default/keymap.c
@@ -19,8 +19,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),

 };
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};