summaryrefslogtreecommitdiffstats
path: root/keyboards/maxipad/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maxipad/config.h')
-rw-r--r--keyboards/maxipad/config.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index 2462a5cfd..4a942aae9 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -24,9 +24,15 @@ 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
/* key matrix size */
#define MATRIX_ROWS 5