Merge pull request #1341 from Dbroqua/patch-3

[qmk_firmware.git] / keyboards / maxipad / rules.mk

diff --git a/keyboards/maxipad/rules.mk b/keyboards/maxipad/rules.mk
index 49bb5f00229f176c9b03d5f42f140790c799c924..a5c739152367dd60fb70ebccc65cc5bc260a426b 100644 (file)
--- 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