diff options
author | Zach White <[email protected]> | 2021-07-14 10:30:28 -0700 |
---|---|---|
committer | Zach White <[email protected]> | 2021-07-14 10:30:28 -0700 |
commit | 44d322623eb875f6eb2e0a317c76af2d47f7a9dc (patch) | |
tree | ab722bcc4cea4e4ed16f0a5dce0602fe1f2c63e5 /requirements.txt | |
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 'requirements.txt')
-rw-r--r-- | requirements.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index 3e23a6f333..92381d7d51 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ appdirs argcomplete colorama -dotty-dict hid hjson jsonschema>=3 milc>=1.4.2 pygments pyusb +qmk-dotty-dict |