]> git.donarmstrong.com Git - qmk_firmware.git/commit
should have fixed conflixed
authorclimbalima <climbalima@gmail.com>
Thu, 17 Nov 2016 00:49:38 +0000 (19:49 -0500)
committerclimbalima <climbalima@gmail.com>
Thu, 17 Nov 2016 00:49:38 +0000 (19:49 -0500)
commit21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60
tree4d51176d38e38de3aed6e69d45ce1f742be279ba
parent668c7397023ad5c9d338b2165699af453f84af0a
should have fixed conflixed
13 files changed:
keyboards/lets_split/Makefile
keyboards/lets_split/config.h
keyboards/lets_split/keymaps/default/keymap.c
keyboards/lets_split/lets_split.c
keyboards/lets_split/rev1/config.h
keyboards/lets_split/rev1/rev1.c
keyboards/lets_split/rev1/rev1.h
keyboards/lets_split/rev2/config.h
keyboards/lets_split/rev2/rev2.c
keyboards/lets_split/rev2/rev2.h
keyboards/maxipad/Makefile
keyboards/maxipad/config.h
keyboards/maxipad/keymaps/default/keymap.c