summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-06-26 05:48:19 +0000
committerQMK Bot <hello@qmk.fm>2021-06-26 05:48:19 +0000
commit298b3831263b318ee19d58f3bea4bf14142557cd (patch)
tree1ffa5fc59654f15e34a933ce2f9c7d20bba049bb
parentcd308613946d47dabfe6799717a02b8ca2833b00 (diff)
parent848da57d6e2b87b566457c49a2ed15c147e221f5 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--.vscode/settings.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8d275ce31a..5fedaf477b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -23,5 +23,8 @@
"editor.trimAutoWhitespace": false,
"files.trimTrailingWhitespace": false
},
- "python.formatting.provider": "yapf"
+ "python.formatting.provider": "yapf",
+ "[json]": {
+ "editor.formatOnSave": false
+ }
}