X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=keyboards%2Flets_split%2Fkeymaps%2Fkhord%2Fkeymap.c;h=2aaab5e86a9e259455e8bac12d2c2a4f25a94e3b;hb=a44ba492eac9ea65f9f1ca620dfc0344d48accd4;hp=6999478730e046bfb342bcb3218cd3ed9454b803;hpb=22f985eba78687d08d17dc6cb4e7266359925c97;p=qmk_firmware.git

diff --git a/keyboards/lets_split/keymaps/khord/keymap.c b/keyboards/lets_split/keymaps/khord/keymap.c
index 699947873..2aaab5e86 100644
--- a/keyboards/lets_split/keymaps/khord/keymap.c
+++ b/keyboards/lets_split/keymaps/khord/keymap.c
@@ -55,7 +55,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = KEYMAP( \
-<<<<<<< HEAD
   KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   TD(SFT_CAP),   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT), \