Update pull conflict

codeit-bootcamp-frontend · Sep 24, 2024 · 0b131e7 · 0b131e7
2 parents 2fdcae3 + 4f9c678
commit 0b131e7
Show file tree

Hide file tree

Showing 43 changed files with 990 additions and 19,949 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@
 # production
 /build
 
-# bacup
+# backup
 /backups
 .bak
 
@@ -25,3 +25,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.vercel