diff options
| author | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
|---|---|---|
| committer | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
| commit | 44d322623eb875f6eb2e0a317c76af2d47f7a9dc (patch) | |
| tree | ab722bcc4cea4e4ed16f0a5dce0602fe1f2c63e5 /lib/python | |
| parent | 52cfc9259b58a3a11a244fbe35c49c7dd1a9cae0 (diff) | |
| parent | ffdfe3798bc7bd374991abe8f10494f2e73aedd5 (diff) | |
| download | qmk_firmware-44d322623eb875f6eb2e0a317c76af2d47f7a9dc.tar.gz qmk_firmware-44d322623eb875f6eb2e0a317c76af2d47f7a9dc.zip | |
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
keyboards/checkerboards/nop60/info.json
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/qmk/cli/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py index 2c3c9c421..91d42bb3a 100644 --- a/lib/python/qmk/cli/__init__.py +++ b/lib/python/qmk/cli/__init__.py | |||
| @@ -16,6 +16,7 @@ import_names = { | |||
| 16 | # A mapping of package name to importable name | 16 | # A mapping of package name to importable name |
| 17 | 'pep8-naming': 'pep8ext_naming', | 17 | 'pep8-naming': 'pep8ext_naming', |
| 18 | 'pyusb': 'usb.core', | 18 | 'pyusb': 'usb.core', |
| 19 | 'qmk-dotty-dict': 'dotty_dict' | ||
| 19 | } | 20 | } |
| 20 | 21 | ||
| 21 | safe_commands = [ | 22 | safe_commands = [ |