Merge remote-tracking branch 'origin/master' into develop
1 files changed, 4 insertions(+), 1 deletions(-) M .vscode/settings.json
M .vscode/settings.json => .vscode/settings.json +4 -1
@@ 23,5 23,8 @@ "editor.trimAutoWhitespace": false, "files.trimTrailingWhitespace": false }, - "python.formatting.provider": "yapf" + "python.formatting.provider": "yapf", + "[json]": { + "editor.formatOnSave": false + } }