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

This commit is contained in:
QMK Bot 2021-05-13 17:46:41 +00:00
commit 929d06a65f

View file

@ -145,3 +145,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Bootmagic Lite key configuration */ /* Bootmagic Lite key configuration */
//#define BOOTMAGIC_LITE_ROW 0 //#define BOOTMAGIC_LITE_ROW 0
//#define BOOTMAGIC_LITE_COLUMN 0 //#define BOOTMAGIC_LITE_COLUMN 0
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT