summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-06-14 00:53:06 +0000
committerQMK Bot <hello@qmk.fm>2021-06-14 00:53:06 +0000
commit836b8f7d64b81ea2f090649e726987a24ddc0531 (patch)
treef392132773c2cf44367f3a5c8ba2abebeda0abd5
parent52028ceea191f49fc350a2c57d44d17f5452b9be (diff)
parent3d62e1dfbf4addea1ca9023cfab76622c061fc8b (diff)
downloadqmk_firmware-836b8f7d64b81ea2f090649e726987a24ddc0531.tar.gz
qmk_firmware-836b8f7d64b81ea2f090649e726987a24ddc0531.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--.vscode/settings.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 775b3df172..8d275ce31a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -22,5 +22,6 @@
"[markdown]": {
"editor.trimAutoWhitespace": false,
"files.trimTrailingWhitespace": false
- }
+ },
+ "python.formatting.provider": "yapf"
}