Fixed a weird diff mishap.
This commit is contained in:
parent
e11cb44926
commit
41d45afd2a
@ -22,20 +22,10 @@ enum planck_keycodes {
|
|||||||
ADJUST
|
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
|
// Layer-Tapping macros
|
||||||
#define ESCLOWR LT(_LOWER, KC_ESC)
|
#define ESCLOWR LT(_LOWER, KC_ESC)
|
||||||
#define MINSRSE LT(_RAISE, KC_MINS)
|
#define MINSRSE LT(_RAISE, KC_MINS)
|
||||||
#define QUOTRSE LT(_RAISE, KC_QUOT)
|
#define QUOTRSE LT(_RAISE, KC_QUOT)
|
||||||
>>>>>>> tv44_revamp
|
|
||||||
|
|
||||||
// Fillers to make layering more clear
|
// Fillers to make layering more clear
|
||||||
#define _______ KC_TRNS
|
#define _______ KC_TRNS
|
||||||
|
Loading…
Reference in New Issue
Block a user