summaryrefslogtreecommitdiff
path: root/keyboards/maxipad/keymaps
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-11-16 19:26:38 -0500
committerclimbalima <climbalima@gmail.com>2016-11-16 19:26:38 -0500
commit5cac51a773bef7fc8064390ac3ee499121a9611d (patch)
tree765b36006bb3d60f51dd0af27e89dac7bce2a59b /keyboards/maxipad/keymaps
parent1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda (diff)
parentbce6e52391da7c5f620c96a91857940f0dee19df (diff)
Merge https://github.com/climbalima/qmk_firmware
Diffstat (limited to 'keyboards/maxipad/keymaps')
-rw-r--r--keyboards/maxipad/keymaps/default/keymap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/keyboards/maxipad/keymaps/default/keymap.c b/keyboards/maxipad/keymaps/default/keymap.c
index 8a9bc4f0d4..5e3a594ccd 100644
--- a/keyboards/maxipad/keymaps/default/keymap.c
+++ b/keyboards/maxipad/keymaps/default/keymap.c
@@ -10,8 +10,13 @@ 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 \
),