mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-23 03:42:59 +00:00
7bec943043
Fixes merge conflicts in:
- keyboards/bm40hsrgb/config.h
- Conflict from PR 13132:
- RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
- updated file with changes from master branch
- keyboards/keebio/iris/keymaps/nstickney/keymap.c
- Conflict from PR 11456:
- layer_state_set_user() updated in develop branch, removed in master branch
- updated file with changes from master branch
|
||
|---|---|---|
| .. | ||
| bdn9 | ||
| bfo9000 | ||
| choconum | ||
| chocopad | ||
| dilly | ||
| dsp40 | ||
| ergodicity | ||
| foldkb | ||
| fourier | ||
| iris | ||
| kbo5000 | ||
| laplace | ||
| levinson | ||
| nyquist | ||
| quefrency | ||
| rorschach | ||
| sinc | ||
| stick | ||
| tragicforce68 | ||
| tukey | ||
| viterbi | ||
| wavelet | ||
| wtf60 | ||