Merge branch 'develop'

2 files changed, 2 insertions, 6 deletions

diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
index eacfacc5a7..0ac12473e0 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
@@ -16,12 +16,8 @@
 
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT  // MT key must be held longer than tapping term for
-                                  // modifer to be registered
 #define RETRO_TAPPING_PER_KEY
 #define TAPPING_TERM_PER_KEY
 
-#define COMBO_COUNT 2             // number of combos used
 #define COMBO_TERM 40             // time out for combos in ms
 #define TAPPING_TERM 200          // time out for tap-hold in ms
-
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
index 40d59ecf76..fc6b19ff3c 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
@@ -99,14 +99,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   COMBO(df_tab, KC_TAB),
   COMBO(jk_alt, KC_LALT),
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}        
+}
 
 uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {