Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
298b383126
5
.vscode/settings.json
vendored
5
.vscode/settings.json
vendored
@ -23,5 +23,8 @@
|
|||||||
"editor.trimAutoWhitespace": false,
|
"editor.trimAutoWhitespace": false,
|
||||||
"files.trimTrailingWhitespace": false
|
"files.trimTrailingWhitespace": false
|
||||||
},
|
},
|
||||||
"python.formatting.provider": "yapf"
|
"python.formatting.provider": "yapf",
|
||||||
|
"[json]": {
|
||||||
|
"editor.formatOnSave": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user