aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-07-28 12:42:21 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-07-28 12:42:21 -0400
commit2d59c97ec16914835c55a409b460ecc79eba152d (patch)
tree14d5a07022da83a56c05738f2aa319ae84e41c2f /keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
parent911d0a040e18ef10d4a683727845ba0314fe1226 (diff)
parent80667e898a17dfae86189d9f5f7dfcc9c7a08eea (diff)
downloadfirmware-2d59c97ec16914835c55a409b460ecc79eba152d.tar.gz
firmware-2d59c97ec16914835c55a409b460ecc79eba152d.tar.bz2
firmware-2d59c97ec16914835c55a409b460ecc79eba152d.zip
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c')
-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 3b74d266f..a909ed3a4 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