[Keymap] fixed conflicts and made sure keymaps compiled, and some newer (older) keyma...
authorRossman360 <53881724+Rossman360@users.noreply.github.com>
Mon, 13 Jan 2020 17:40:00 +0000 (12:40 -0500)
committerJames Young <18669334+noroadsleft@users.noreply.github.com>
Mon, 13 Jan 2020 17:40:00 +0000 (09:40 -0800)
commit390a4fdc9d9a7c65c202d69eb40fbfcfcb070bb0
tree23abbb8d841747bae69467df5e4883648a83914a
parent1034df577d2931292802e00c61dc9133c67dcabd
[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
keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk
keyboards/keebio/viterbi/keymaps/met/keymap.c [new file with mode: 0644]
keyboards/keebio/viterbi/keymaps/met/rules.mk [new file with mode: 0644]
users/rossman360/rossman360.h