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

2021-06-26 05:48:19 +00:00 · 2021-06-26 05:48:19 +00:00 · 298b383126
commit 298b383126
parent cd30861394 848da57d6e
1 changed files with 4 additions and 1 deletions
--- 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
+    }
 }