Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
55be8f2c2b
1 changed files with 0 additions and 1 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue