mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-06-01 05:53:22 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
d0463f7fdd
@ -31,10 +31,6 @@
|
|||||||
# include "rgblight.h"
|
# include "rgblight.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SPLIT_WATCHDOG_ENABLE)
|
|
||||||
# include "bootloader.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SPLIT_USB_TIMEOUT
|
#ifndef SPLIT_USB_TIMEOUT
|
||||||
# define SPLIT_USB_TIMEOUT 2000
|
# define SPLIT_USB_TIMEOUT 2000
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user