summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-12-03 17:37:41 -0500
committerclimbalima <climbalima@gmail.com>2016-12-03 17:37:41 -0500
commit0f71c81df833a282250ecc4e66034320e40b208e (patch)
tree67e8aa3bbb1ed9cc121fb63bd8c312dd15e7e209 /keyboards
parent45b7718fb154c6400b169a9d3005cedebd37ff9a (diff)
having trouble with conflicts
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/maxipad/config.h15
-rw-r--r--keyboards/maxipad/readme.md2
-rw-r--r--keyboards/maxipad/rules.mk3
3 files changed, 0 insertions, 20 deletions
diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index 4377a892e9..d7a5ef5646 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -32,20 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 5
#define MATRIX_COLS 6
-<<<<<<< HEAD
-// Planck PCB default pin-out
-// Change this to how you wired your keyboard
-// COLS: Left to right, ROWS: Top to bottom
-#ifdef USE_PRO_MICRO
- #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
- #define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
- #define UNUSED_PINS
- #else
- #define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
- #define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
- #define UNUSED_PINS
- #endif
-=======
/*
* Keyboard Matrix Assignments
*
@@ -65,7 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
//#define UNUSED_PINS
->>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
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
diff --git a/keyboards/maxipad/rules.mk b/keyboards/maxipad/rules.mk
index 49bb5f0022..a5c7391523 100644
--- a/keyboards/maxipad/rules.mk
+++ b/keyboards/maxipad/rules.mk
@@ -59,7 +59,6 @@ EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
CONSOLE_ENABLE ?= yes # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-<<<<<<< HEAD
# SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
# NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
# BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality
@@ -67,7 +66,6 @@ COMMAND_ENABLE ?= yes # Commands for debug and configuration
# UNICODE_ENABLE ?= YES # Unicode
# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID
USE_PRO_MICRO ?= yes
-=======
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE ?= no # USB Nkey Rollover
@@ -76,4 +74,3 @@ MIDI_ENABLE ?= no # MIDI controls
UNICODE_ENABLE ?= no # Unicode
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE ?= no # Audio output on port C6
->>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1