diff options
| author | Joshua Diamond <josh@windowoffire.com> | 2022-09-06 17:42:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 17:42:43 -0400 |
| commit | a4d1d8b7450e409d007f6e795ffb1cee42a8e511 (patch) | |
| tree | 565467087111070e36c2b72fe0a8f18dad6563a8 /keyboards/3w6/rev1/rev1.h | |
| parent | dc4af81e0b375b559d270bbeb3495d61933f8c54 (diff) | |
Resolve conflict merging master to develop (#18297)
* Discourage use of ENCODER_MAP at keyboard level (#18286)
* Discourage use of ENCODER_MAP at keyboard level
* Update docs/feature_encoders.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Fungo rev1: fix QMK Configurator key sequence (#18293)
* info.json: correct JSON syntax; friendly formatting
* info.json: fix key sequence
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'keyboards/3w6/rev1/rev1.h')
0 files changed, 0 insertions, 0 deletions