diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-19 00:11:55 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-02-19 00:11:55 -0500 |
| commit | db1e9a469a8dda068a913fe570c86a1fefc1b4cd (patch) | |
| tree | 73119ccaacc830dbb6787e239e5fa4f16762fe0f /quantum | |
| parent | c2239e6b96fdea11d449d220db3d8bca40b38bde (diff) | |
helps to save before committing
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/quantum.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 761ba37f37..582f8920b1 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) { |