merging

diff --cc quantum/quantum.c
index 95f06d95d44a313f5fd81f72c2fe5d1cf5b71d22,4a6d0355fabe1590226aa5672ea89d41fe385545..761ba37f37a50c97fd543ceaafde7beb548788a2
--- 1/quantum/quantum.c
--- 2/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) {

diff --cc quantum/quantum.h
Simple merge