fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 19:40:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

helps to save before committing

Browse source
This commit is contained in:
Jack Humbert 2017-02-19 00:11:55 -05:00
parent c2239e6b96
commit db1e9a469a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quantum/quantum.c
View file

@ -7,14 +7,12 @@
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#endif #endif
<<<<<<< HEAD
#include "backlight.h" #include "backlight.h"
extern backlight_config_t backlight_config; extern backlight_config_t backlight_config;
=======
#ifdef FAUXCLICKY_ENABLE #ifdef FAUXCLICKY_ENABLE
#include "fauxclicky.h" #include "fauxclicky.h"
#endif #endif
>>>>>>> 49e72632d2200fc3bf71d5ced2aa43058da3b2e0
static void do_code16 (uint16_t code, void (*f) (uint8_t)) { static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
switch (code) { switch (code) {