diff options
| author | Dylan Khor <khord@simspace.com> | 2017-06-15 03:26:04 -0400 |
|---|---|---|
| committer | Dylan Khor <khord@simspace.com> | 2017-06-15 03:26:04 -0400 |
| commit | a44ba492eac9ea65f9f1ca620dfc0344d48accd4 (patch) | |
| tree | ffcf9a07792929f905dfd02914961c019a16ae46 /keyboards/lets_split/keymaps/khord/keymap.c | |
| parent | 22f985eba78687d08d17dc6cb4e7266359925c97 (diff) | |
minor fixes
Diffstat (limited to 'keyboards/lets_split/keymaps/khord/keymap.c')
| -rw-r--r-- | keyboards/lets_split/keymaps/khord/keymap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/keyboards/lets_split/keymaps/khord/keymap.c b/keyboards/lets_split/keymaps/khord/keymap.c index 6999478730..2aaab5e86a 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), \ |