resolved conflicts

1 files changed, 8 insertions, 9 deletions

diff --git a/layouts/community/ortho_4x12/wanleg/keymap.c b/layouts/community/ortho_4x12/wanleg/keymap.c
index 23e794dc41..bcf6671aed 100644
--- a/layouts/community/ortho_4x12/wanleg/keymap.c
+++ b/layouts/community/ortho_4x12/wanleg/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _____________DIRECTIONS_Row__2_____________,
   _______, _______, ONEHAND, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
-#elif defined(KEYBOARD_40percentclub_4x4)
+#elif defined(KEYBOARD_40percentclub_4x4) || defined(KEYBOARD_40percentclub_nori)
 [_GK] = LAYOUT_ortho_4x12_wrapper(
   _______________GherkinLike_0_______________,
   _______________GherkinLike_1_______________,
@@ -36,14 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______________NUMPAD_Row__3_______________
 ),
 
-#elif defined(KEYBOARD_jj40)
-[_GK] = LAYOUT_ortho_4x12_wrapper(
-  _______________GherkinLike_0_______________,
-  _______________GherkinLike_1_______________,
-  _______________GherkinLike_2_______________,
-  TD(RST_TAP_DANCE), BL_TOGG, BL_STEP, BL_BRTG, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
-),
-
 #else
 [_GK] = LAYOUT_ortho_4x12_wrapper(
   _______________GherkinLike_0_______________,
@@ -94,4 +86,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ______________ETCETERA_Row__3______________
 ),
 
+[_FN] = LAYOUT_ortho_4x12_wrapper(
+  _______, _______________Gherkin_FN_0________________, _______,
+  _______, _______________Gherkin_FN_0________________, _______,
+  _______, _______________Gherkin_FN_0________________, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
 };