1
0
Fork 0

[Keymap] fixed conflicts and made sure keymaps compiled, and some newer (older) keymaps snuck in (#7828)

* hope this works

* Some new things crept in

* remove nonsense config file

* spacing fix

* more spacing

* quick revert of mysterious file

* file revert take two

* take three

* take four

* deleted unneeded lines

* brought back not-unneeded line

* whitespace delete
This commit is contained in:
Rossman360 2020-01-13 12:40:00 -05:00 committed by James Young
parent 1034df577d
commit 390a4fdc9d
4 changed files with 323 additions and 1 deletions

View file

@ -26,4 +26,3 @@ enum custom_keycodes {
PMERGE,
REMCAPS,
};