From: IBNobody <ibnobody@gmail.com>
Date: Fri, 15 Apr 2016 03:33:18 +0000 (-0500)
Subject: fixed merging
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=66c1024bd328b687fba0645f70469094e75d624c;p=qmk_firmware.git

fixed merging
---

66c1024bd328b687fba0645f70469094e75d624c
diff --cc keyboard/planck/Makefile
index 5271c2795,dc6e46df2..992679f47
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@@ -127,27 -159,7 +159,31 @@@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOIN
  OPT_DEFS += -DBOOTLOADER_SIZE=4096
  
  
++<<<<<<< HEAD
 +# Build Options
 +#   comment out to disable the options.
 +#
 +BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
 +MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 +EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 +CONSOLE_ENABLE = yes        # Console for debug(+400)
 +COMMAND_ENABLE = yes        # Commands for debug and configuration
 +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
 +# MIDI_ENABLE = yes         # MIDI controls
 +# AUDIO_ENABLE = yes        # Audio output on port C6
 +# UNICODE_ENABLE = yes      # Unicode
 +# BLUETOOTH_ENABLE = ye     # Enable Bluetooth with the Adafruit EZ-Key HID
 +# RGBLIGHT_ENABLE = yes     # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 +
 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 +#SLEEP_LED_ENABLE = yes    # Breathing sleep LED during USB suspend
 +
 +
 +ifdef BACKLIGHT_ENABLE
++=======
+ ifeq ($(BACKLIGHT_ENABLE), yes)
++>>>>>>> master
  	SRC += backlight.c
  endif