Merge branch 'main' of https://github.com/kunheekimkr/PSbank

kunheekimkr · Mar 6, 2022 · 1732065 · 1732065
2 parents 0f1a820 + 0012469
commit 1732065
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
 *.dSYM
+<<<<<<< HEAD
 .vscode/
-.DS_STORE
+.DS_STORE
+=======
+
+.vscode/
+>>>>>>> 0012469a461d0fec03085596dd0fe8571855b4fc
diff --git a/.vscode/tasks.json b/.vscode/tasks.json