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

0 Fork 0

* 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 authored and

James Young committed 2020-01-13 09:40:00 -08:00

1 parent 1034df577d

commit 390a4fdc9d

4 files changed

+323 -1

No files matched your search

									
										users/rossman360/rossman360.h
									
		-1
	
												View File
												
				@@ -26,4 +26,3 @@ enum custom_keycodes {

				  PMERGE,

				  REMCAPS,

				};