diff options
| author | Ryan Mitchell <rmitch@onprem.com> | 2017-12-20 21:19:45 -0600 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-12-20 22:27:09 -0500 |
| commit | 3b9e4967b89383307e00cbcb05061d3a1830c07e (patch) | |
| tree | 69b9fb2c13ce5b5f3ce838c52b5d5192c244b01d /keyboards/dz60/keymaps | |
| parent | 7c57104b51903bfb1f7e35a5195222e13def7557 (diff) | |
fix breaking build: remove merge conflict text
Diffstat (limited to 'keyboards/dz60/keymaps')
| -rw-r--r-- | keyboards/dz60/keymaps/iso_7u_space/keymap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/keyboards/dz60/keymaps/iso_7u_space/keymap.c b/keyboards/dz60/keymaps/iso_7u_space/keymap.c index cae948ff80..71c5c60d03 100644 --- a/keyboards/dz60/keymaps/iso_7u_space/keymap.c +++ b/keyboards/dz60/keymaps/iso_7u_space/keymap.c @@ -4,7 +4,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -<<<<<<< HEAD /* ISO 7u layout layer 0 * ,-----------------------------------------------------------------------------------------. * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ß | ´ | BSPC | @@ -19,8 +18,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------------' */ -======= ->>>>>>> dc7cc26dff01cc84b6f9f96af6d3aa03469aaca3 KEYMAP( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |