summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keyboards/tv44/keymaps/xyverz/keymap.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/keyboards/tv44/keymaps/xyverz/keymap.c b/keyboards/tv44/keymaps/xyverz/keymap.c
index d09a11c35c..9c1b3076e8 100644
--- a/keyboards/tv44/keymaps/xyverz/keymap.c
+++ b/keyboards/tv44/keymaps/xyverz/keymap.c
@@ -22,10 +22,20 @@ 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