diff options
| author | climbalima <climbalima@gmail.com> | 2016-12-03 17:37:41 -0500 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-12-03 17:37:41 -0500 |
| commit | 0f71c81df833a282250ecc4e66034320e40b208e (patch) | |
| tree | 67e8aa3bbb1ed9cc121fb63bd8c312dd15e7e209 /keyboards/maxipad/readme.md | |
| parent | 45b7718fb154c6400b169a9d3005cedebd37ff9a (diff) | |
having trouble with conflicts
Diffstat (limited to 'keyboards/maxipad/readme.md')
| -rw-r--r-- | keyboards/maxipad/readme.md | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md index 58ed5d718f..861ea2b078 100644 --- a/keyboards/maxipad/readme.md +++ b/keyboards/maxipad/readme.md @@ -1,6 +1,4 @@ -<<<<<<< HEAD Maxipad keyboard firmware -====================== ## Quantum MK Firmware |