Merge branch 'main'

This commit is contained in:
Bassam Husain
2023-01-17 23:48:53 -05:00
2 changed files with 7 additions and 5 deletions

View File

@@ -1,5 +1,6 @@
{
"editor.tabSize": 4,
"editor.insertSpaces": true,
"editor.detectIndentation": false
"editor.detectIndentation": false,
"git.mergeEditor": false
}