summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-07-28 12:26:43 -0400
committerGitHub <noreply@github.com>2016-07-28 12:26:43 -0400
commit36df9fd3fd519eee8c7dc7fadba3319a0e4ede6d (patch)
treea74434936bc024065953147aa95beb373c14159d /keyboards
parentf96a2a74eaeff86ec19eb7bc1cca997e277a9b96 (diff)
parent13bb3a73798da4c0f4ddc9cb644c1cd82f7fc8c1 (diff)
downloadqmk_firmware-36df9fd3fd519eee8c7dc7fadba3319a0e4ede6d.tar.gz
qmk_firmware-36df9fd3fd519eee8c7dc7fadba3319a0e4ede6d.zip
Merge pull request #568 from sethbc/fix-colemak-osx-pc-no
update NO_AMP to NO_AMPR
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c b/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
index 3b74d266f7..a909ed3a4f 100644
--- a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
NO_COLN, KC_A, KC_R, KC_S, KC_T, KC_D,
KC_EXLM, KC_Z, KC_X, KC_C, KC_V, KC_B, NO_SCLN,
MO(4), KC_BTN1, KC_BTN2, KC_TAB,GUI_T(KC_COMMA),
- NO_AMP, NO_PIPE,
+ NO_AMPR, NO_PIPE,
NO_PLUS,
KC_FN1,CTL_T(KC_DOT),ALT_T(NO_MINS),
// right hand