fix breaking build: remove merge conflict text

diff --git a/keyboards/dz60/keymaps/iso_7u_space/keymap.c b/keyboards/dz60/keymaps/iso_7u_space/keymap.c
index cae948ff801565fb5654b272e42f3bb29fc6d315..71c5c60d03357fde404da73e7bf28a71c7e29cc3 100644 (file)
--- 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,