From a44ba492eac9ea65f9f1ca620dfc0344d48accd4 Mon Sep 17 00:00:00 2001
From: Dylan Khor <khord@simspace.com>
Date: Thu, 15 Jun 2017 03:26:04 -0400
Subject: [PATCH] minor fixes
---
keyboards/lets_split/keymaps/khord/config.h | 4 +---
keyboards/lets_split/keymaps/khord/keymap.c | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/keyboards/lets_split/keymaps/khord/config.h b/keyboards/lets_split/keymaps/khord/config.h
index 1df3c5e1f..d6a99a8b2 100644
--- a/keyboards/lets_split/keymaps/khord/config.h
+++ b/keyboards/lets_split/keymaps/khord/config.h
@@ -15,11 +15,9 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#define TAPPING_TERM 150
#define USE_SERIAL
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
#define EE_HANDS
#undef RGBLED_NUM
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), \