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) | |
| download | qmk_firmware-db1e9a469a8dda068a913fe570c86a1fefc1b4cd.tar.gz qmk_firmware-db1e9a469a8dda068a913fe570c86a1fefc1b4cd.zip | |
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 761ba37f3..582f8920b 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -7,14 +7,12 @@ | |||
| 7 | #define TAPPING_TERM 200 | 7 | #define TAPPING_TERM 200 |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | <<<<<<< HEAD | ||
| 11 | #include "backlight.h" | 10 | #include "backlight.h" |
| 12 | extern backlight_config_t backlight_config; | 11 | extern backlight_config_t backlight_config; |
| 13 | ======= | 12 | |
| 14 | #ifdef FAUXCLICKY_ENABLE | 13 | #ifdef FAUXCLICKY_ENABLE |
| 15 | #include "fauxclicky.h" | 14 | #include "fauxclicky.h" |
| 16 | #endif | 15 | #endif |
| 17 | >>>>>>> 49e72632d2200fc3bf71d5ced2aa43058da3b2e0 | ||
| 18 | 16 | ||
| 19 | static void do_code16 (uint16_t code, void (*f) (uint8_t)) { | 17 | static void do_code16 (uint16_t code, void (*f) (uint8_t)) { |
| 20 | switch (code) { | 18 | switch (code) { |