diff options
| author | Xyverz <xyverz@gmail.com> | 2016-08-12 22:30:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-12 22:30:01 -0700 |
| commit | 3bae791372e2090b30647d431c70c233caaef26f (patch) | |
| tree | 11b94774dc780891bea9d356ef690bc000273b50 /keyboards/atreus | |
| parent | 458607ee5eafe1cc095b258cac014c334d8e7b72 (diff) | |
Update keymap.c
Diffstat (limited to 'keyboards/atreus')
| -rw-r--r-- | keyboards/atreus/keymaps/xyverz/keymap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index 02a661c8e3..b418cc9b5e 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -53,11 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN}, {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_PLUS}, {KC_TRNS, KC_TRNS, DVORAK, QWERTY, COLEMAK, KC_LCTL, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12 }, -<<<<<<< HEAD - {KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), RESET } -======= {KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), RESET} ->>>>>>> e1abe4c... Corrections to the Atreus Makefile and updates to my keymap } }; |