rebase conflict resolved

This commit is contained in:
Krishna Vedala 2020-05-24 13:22:55 -04:00
parent e5d3316ef2
commit 9b61d570f1

View File

@ -68,4 +68,4 @@
"editor.formatOnSave": true,
"editor.formatOnType": true,
"editor.formatOnPaste": true
}
}