Merge branch 'tv44_revamp'

diff --cc keyboards/tv44/keymaps/xyverz/keymap.c
index f237073c04c4960fc0e53ffbd33762a7519e2a87,d09a11c35c50b57d776b272093f1f201022de516..9c1b3076e8e24568ed2be8243bb9dce122286aa4
--- 1/keyboards/tv44/keymaps/xyverz/keymap.c
--- 2/keyboards/tv44/keymaps/xyverz/keymap.c
+++ b/keyboards/tv44/keymaps/xyverz/keymap.c
@@@ -4,19 -4,28 +4,38 @@@
  
  extern keymap_config_t keymap_config;
  
- #define _DV 0
- #define _QW 1
- #define _CM 2
- #define _L1 3
- #define _L2 4
+ enum planck_layers {
+   _QWERTY,
+   _COLEMAK,
+   _DVORAK,
+   _LOWER,
+   _RAISE,
+   _ADJUST
+ };
+ 
+ enum planck_keycodes {
+   DVORAK = SAFE_RANGE,
+   QWERTY,
+   COLEMAK,
+   LOWER,
+   RAISE,
+   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