]> git.donarmstrong.com Git - qmk_firmware.git/commit
having trouble with conflicts
authorclimbalima <climbalima@gmail.com>
Sat, 3 Dec 2016 22:37:41 +0000 (17:37 -0500)
committerclimbalima <climbalima@gmail.com>
Sat, 3 Dec 2016 22:37:41 +0000 (17:37 -0500)
commit0f71c81df833a282250ecc4e66034320e40b208e
tree67e8aa3bbb1ed9cc121fb63bd8c312dd15e7e209
parent45b7718fb154c6400b169a9d3005cedebd37ff9a
having trouble with conflicts
keyboards/maxipad/config.h
keyboards/maxipad/readme.md
keyboards/maxipad/rules.mk