ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a weird diff mishap.

Browse source
This commit is contained in:
Xyverz 2017-04-17 21:54:02 -07:00
parent e11cb44926
commit 41d45afd2a
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
keyboards/tv44/keymaps/xyverz/keymap.c
View file

@ -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