Chimera Ortho Readme (#1943)

[qmk_firmware.git] / keyboards / maxipad / readme.md

diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md
index 58ed5d718ff6d69a41e47531dc4008475dd1ec7f..861ea2b0782eaaa38579d55f932a616d6083483b 100644 (file)
--- a/keyboards/maxipad/readme.md
+++ b/keyboards/maxipad/readme.md
@@ -1,6 +1,4 @@
-<<<<<<< HEAD
 Maxipad keyboard firmware
-======================
 
 ## Quantum MK Firmware