Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2020-12-18 20:57:00 +00:00
commit 45a1a3239d

View File

@ -175,7 +175,7 @@ Creates a keymap.json from a keymap.c.
**Usage**: **Usage**:
``` ```
qmk c2json [--no-cpp] [-o OUTPUT] filename qmk c2json -km KEYMAP -kb KEYBOARD [-q] [--no-cpp] [-o OUTPUT] filename
``` ```
## `qmk lint` ## `qmk lint`