diff options
| author | climbalima <climbalima@gmail.com> | 2016-11-16 19:49:38 -0500 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-11-16 19:49:38 -0500 |
| commit | 21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (patch) | |
| tree | 4d51176d38e38de3aed6e69d45ce1f742be279ba /keyboards/maxipad/keymaps | |
| parent | 668c7397023ad5c9d338b2165699af453f84af0a (diff) | |
| download | qmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.gz qmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.zip | |
should have fixed conflixed
Diffstat (limited to 'keyboards/maxipad/keymaps')
| -rw-r--r-- | keyboards/maxipad/keymaps/default/keymap.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/keyboards/maxipad/keymaps/default/keymap.c b/keyboards/maxipad/keymaps/default/keymap.c index 5e3a594ccd..43ace32419 100644 --- a/keyboards/maxipad/keymaps/default/keymap.c +++ b/keyboards/maxipad/keymaps/default/keymap.c @@ -10,15 +10,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = KEYMAP( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \ -<<<<<<< HEAD KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, \ -======= KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ ), }; |