mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-10-06 09:00:40 +08:00
Merge remote-tracking branch 'origin/master' into develop
CI Build Major Branch / Determine concurrency (push) Has been cancelled
CLI CI / test (push) Has been cancelled
Generate Develop Docs / generate (push) Has been cancelled
Update feature branches after develop merge / feature_branch_update (riot) (push) Has been cancelled
Update feature branches after develop merge / feature_branch_update (xap) (push) Has been cancelled
Lint Format / lint (push) Has been cancelled
Regenerate Files / regen (push) Has been cancelled
Unit Tests / test (push) Has been cancelled
CI Build Major Branch / Compile keymap ${{ matrix.keymap }} (push) Has been cancelled
CI Build Major Branch / Consolidation (push) Has been cancelled
CI Build Major Branch / Determine concurrency (push) Has been cancelled
CLI CI / test (push) Has been cancelled
Generate Develop Docs / generate (push) Has been cancelled
Update feature branches after develop merge / feature_branch_update (riot) (push) Has been cancelled
Update feature branches after develop merge / feature_branch_update (xap) (push) Has been cancelled
Lint Format / lint (push) Has been cancelled
Regenerate Files / regen (push) Has been cancelled
Unit Tests / test (push) Has been cancelled
CI Build Major Branch / Compile keymap ${{ matrix.keymap }} (push) Has been cancelled
CI Build Major Branch / Consolidation (push) Has been cancelled
This commit is contained in:
@@ -394,7 +394,6 @@ combo_t *overlaps(combo_t *combo1, combo_t *combo2) {
|
||||
while ((key2 = pgm_read_word(&combo2->keys[idx2])) != COMBO_END) {
|
||||
if (key1 == key2) {
|
||||
overlaps = true;
|
||||
break;
|
||||
}
|
||||
idx2 += 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user