From 21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 Mon Sep 17 00:00:00 2001
From: climbalima <climbalima@gmail.com>
Date: Wed, 16 Nov 2016 19:49:38 -0500
Subject: should have fixed conflixed

---
 keyboards/maxipad/config.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'keyboards/maxipad/config.h')

diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index 4a942aae9..fbe64a5b0 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -24,15 +24,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
-<<<<<<< HEAD
-#define MANUFACTURER    You
-#define PRODUCT         maxipad
-#define DESCRIPTION     A custom keyboard
-=======
 #define MANUFACTURER    Wootpatoot
 #define PRODUCT         maxipad
-#define DESCRIPTION     g8ming keeb
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+#define DESCRIPTION     A custom keyboard
+
 
 /* key matrix size */
 #define MATRIX_ROWS 5
-- 
cgit v1.2.3-24-g4f1b