From: Jack Humbert <jack.humb@gmail.com>
Date: Sun, 19 Feb 2017 05:11:55 +0000 (-0500)
Subject: helps to save before committing
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=db1e9a469a8dda068a913fe570c86a1fefc1b4cd;p=qmk_firmware.git

helps to save before committing
---

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 761ba37f3..582f8920b 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -7,14 +7,12 @@
 #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) {