aboutsummaryrefslogtreecommitdiff
path: root/.vscode/settings.json
diff options
context:
space:
mode:
authorJenny Yu <jennyyu212@outlook.com>2022-06-08 19:00:02 -0700
committerJenny Yu <jennyyu212@outlook.com>2022-06-08 19:00:02 -0700
commitdff15ea5cc4b351f9bea90c1822e1b02d4f0730b (patch)
treee3e893b6b8fdf95e9860673f0b4357e26dc9ff1d /.vscode/settings.json
parent88a8f35c33bbff61b0058a66d7bcc586d483deca (diff)
parent0ae3de67900489a6ffd43eabaa810c3ec3fdddd9 (diff)
fix: merge conflicts
Diffstat (limited to '.vscode/settings.json')
-rw-r--r--.vscode/settings.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 27acfd1a2..a6e6ad360 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,7 +6,7 @@
"**/CVS": true,
"**/.DS_Store": true,
},
- "editor.formatOnSave": true,
+ "editor.formatOnSave": false,
"editor.detectIndentation": false,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,