summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXyverz <xyverz@gmail.com>2017-04-17 21:54:02 -0700
committerXyverz <xyverz@gmail.com>2017-04-17 21:54:02 -0700
commit41d45afd2a76ad5a0168b7aca615a0cd7a35cc00 (patch)
treee0238f83918cb5eb6f28234a24039d802076ef0e
parente11cb44926162fd3df72cdebae9867edf403c538 (diff)
downloadqmk_firmware-41d45afd2a76ad5a0168b7aca615a0cd7a35cc00.tar.gz
qmk_firmware-41d45afd2a76ad5a0168b7aca615a0cd7a35cc00.zip
Fixed a weird diff mishap.
-rw-r--r--keyboards/tv44/keymaps/xyverz/keymap.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/keyboards/tv44/keymaps/xyverz/keymap.c b/keyboards/tv44/keymaps/xyverz/keymap.c
index 9c1b3076e8..d09a11c35c 100644
--- a/keyboards/tv44/keymaps/xyverz/keymap.c
+++ b/keyboards/tv44/keymaps/xyverz/keymap.c
@@ -22,20 +22,10 @@ enum planck_keycodes {
ADJUST
};
-<<<<<<< HEAD
-// Macro name shortcuts
-#define DVORAK M(_DV)
-#define QWERTY M(_QW)
-#define COLEMAK M(_CM)
-#define ESCLOWR LT(_L1, KC_ESC)
-#define MINSRSE LT(_L2, KC_MINS)
-#define QUOTRSE LT(_L2, KC_QUOT)
-=======
// Layer-Tapping macros
#define ESCLOWR LT(_LOWER, KC_ESC)
#define MINSRSE LT(_RAISE, KC_MINS)
#define QUOTRSE LT(_RAISE, KC_QUOT)
->>>>>>> tv44_revamp
// Fillers to make layering more clear
#define _______ KC_TRNS