aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/maxipad/config.h
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-11-16 19:49:38 -0500
committerclimbalima <climbalima@gmail.com>2016-11-16 19:49:38 -0500
commit21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (patch)
tree4d51176d38e38de3aed6e69d45ce1f742be279ba /keyboards/maxipad/config.h
parent668c7397023ad5c9d338b2165699af453f84af0a (diff)
downloadfirmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.gz
firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.bz2
firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.zip
should have fixed conflixed
Diffstat (limited to 'keyboards/maxipad/config.h')
-rw-r--r--keyboards/maxipad/config.h9
1 files changed, 2 insertions, 7 deletions
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