From: Xyverz <xyverz@gmail.com>
Date: Tue, 18 Apr 2017 04:54:02 +0000 (-0700)
Subject: Fixed a weird diff mishap.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=41d45afd2a76ad5a0168b7aca615a0cd7a35cc00;p=qmk_firmware.git

Fixed a weird diff mishap.
---

diff --git a/keyboards/tv44/keymaps/xyverz/keymap.c b/keyboards/tv44/keymaps/xyverz/keymap.c
index 9c1b3076e..d09a11c35 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