Merge remote-tracking branch 'origin/master' into develop

4 years ago · 836b8f7d64
parent 52028ceea1 3d62e1dfbf
commit 836b8f7d64
1 changed files with 2 additions and 1 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -22,5 +22,6 @@
    "[markdown]": {
        "editor.trimAutoWhitespace": false,
        "files.trimTrailingWhitespace": false
-    }
+    },
    "python.formatting.provider": "yapf"
 }