From 0f71c81df833a282250ecc4e66034320e40b208e Mon Sep 17 00:00:00 2001
From: climbalima <climbalima@gmail.com>
Date: Sat, 3 Dec 2016 17:37:41 -0500
Subject: having trouble with conflicts

---
 keyboards/maxipad/readme.md | 2 --
 1 file changed, 2 deletions(-)

(limited to 'keyboards/maxipad/readme.md')

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
 
-- 
cgit v1.2.3