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

This commit is contained in:
QMK Bot
2026-06-08 00:37:23 +00:00
-1
View File
@@ -394,7 +394,6 @@ combo_t *overlaps(combo_t *combo1, combo_t *combo2) {
while ((key2 = pgm_read_word(&combo2->keys[idx2])) != COMBO_END) { while ((key2 = pgm_read_word(&combo2->keys[idx2])) != COMBO_END) {
if (key1 == key2) { if (key1 == key2) {
overlaps = true; overlaps = true;
break;
} }
idx2 += 1; idx2 += 1;
} }