diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-26 05:48:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-26 05:48:19 +0000 |
| commit | 298b3831263b318ee19d58f3bea4bf14142557cd (patch) | |
| tree | 1ffa5fc59654f15e34a933ce2f9c7d20bba049bb | |
| parent | cd308613946d47dabfe6799717a02b8ca2833b00 (diff) | |
| parent | 848da57d6e2b87b566457c49a2ed15c147e221f5 (diff) | |
| download | qmk_firmware-298b3831263b318ee19d58f3bea4bf14142557cd.tar.gz qmk_firmware-298b3831263b318ee19d58f3bea4bf14142557cd.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | .vscode/settings.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 8d275ce31..5fedaf477 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json | |||
| @@ -23,5 +23,8 @@ | |||
| 23 | "editor.trimAutoWhitespace": false, | 23 | "editor.trimAutoWhitespace": false, |
| 24 | "files.trimTrailingWhitespace": false | 24 | "files.trimTrailingWhitespace": false |
| 25 | }, | 25 | }, |
| 26 | "python.formatting.provider": "yapf" | 26 | "python.formatting.provider": "yapf", |
| 27 | "[json]": { | ||
| 28 | "editor.formatOnSave": false | ||
| 29 | } | ||
| 27 | } | 30 | } |