3 commits

Author	SHA1	Message	Date
Ryan Mitchell	3b9e4967b8	fix breaking build: remove merge conflict text	2017-12-20 22:27:09 -05:00
root	1add90a6d2	reforked master and added changes to 7u and 6u iso layouts	2017-12-15 14:02:18 -05:00
bunnybugslpat	f229d22416	added iso support ... added a keymap for an iso layout with 7u spacebar	2017-12-14 00:01:14 -05:00