summaryrefslogtreecommitdiffstats
path: root/keyboards/maxipad/readme.md
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maxipad/readme.md')
-rw-r--r--keyboards/maxipad/readme.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md
index 58ed5d718..861ea2b07 100644
--- a/keyboards/maxipad/readme.md
+++ b/keyboards/maxipad/readme.md
@@ -1,6 +1,4 @@
-<<<<<<< HEAD
Maxipad keyboard firmware
-======================
## Quantum MK Firmware