From: Jack Humbert <jack.humb@gmail.com>
Date: Sun, 19 Feb 2017 05:04:14 +0000 (-0500)
Subject: merging
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c2239e6b96fdea11d449d220db3d8bca40b38bde;p=qmk_firmware.git

merging
---

c2239e6b96fdea11d449d220db3d8bca40b38bde
diff --cc quantum/quantum.c
index 95f06d95d,4a6d0355f..761ba37f3
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@@ -7,8 -7,9 +7,14 @@@
  #define TAPPING_TERM 200
  #endif
  
++<<<<<<< HEAD
 +#include "backlight.h"
 +extern backlight_config_t backlight_config;
++=======
+ #ifdef FAUXCLICKY_ENABLE
+ #include "fauxclicky.h"
+ #endif
++>>>>>>> 49e72632d2200fc3bf71d5ced2aa43058da3b2e0
  
  static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
    switch (code) {