briemens/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

having trouble with conflicts

Browse Source
This commit is contained in:
climbalima
2016-12-03 17:37:41 -05:00
parent 45b7718fb1
commit 0f71c81df8
3 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/maxipad/readme.md
View File

@@ -1,6 +1,4 @@
<<<<<<< HEAD
Maxipad keyboard firmware
======================
## Quantum MK Firmware