diff options
author | Joshua Diamond <[email protected]> | 2022-09-06 17:42:43 -0400 |
---|---|---|
committer | GitHub <[email protected]> | 2022-09-06 17:42:43 -0400 |
commit | a4d1d8b7450e409d007f6e795ffb1cee42a8e511 (patch) | |
tree | 565467087111070e36c2b72fe0a8f18dad6563a8 /docs/pr_checklist.md | |
parent | dc4af81e0b375b559d270bbeb3495d61933f8c54 (diff) | |
download | qmk_firmware-a4d1d8b7450e409d007f6e795ffb1cee42a8e511.tar.gz qmk_firmware-a4d1d8b7450e409d007f6e795ffb1cee42a8e511.zip |
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 <[email protected]>
Co-authored-by: Ryan <[email protected]>
* 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 <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: James Young <[email protected]>
Diffstat (limited to 'docs/pr_checklist.md')
-rw-r--r-- | docs/pr_checklist.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md index ae5cb5eef6..1034631863 100644 --- a/docs/pr_checklist.md +++ b/docs/pr_checklist.md @@ -67,6 +67,9 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard - no `(-/+size)` comments related to enabling features - remove the list of alternate bootloaders if one has been specified - no re-definitions of the default MCU parameters if same value, when compared to the equivalent MCU in [mcu_selection.mk](https://github.com/qmk/qmk_firmware/blob/master/builddefs/mcu_selection.mk) + - no "keymap only" features enabled + - `COMBO_ENABLE` + - `ENCODER_MAP_ENABLE` - keyboard `config.h` - don't repeat `MANUFACTURER` in the `PRODUCT` value - no `#define DESCRIPTION` |