Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-08-12 02:04:13 +00:00
commit 15422b3b26

View file

@ -146,7 +146,7 @@ bool command_proc(uint8_t code);
#endif
#ifndef MAGIC_KEY_EEPROM_CLEAR
# define MAGIC_KEY_EEPROM_CLEAR BSPACE
# define MAGIC_KEY_EEPROM_CLEAR BACKSPACE
#endif
#ifndef MAGIC_KEY_NKRO