Merge branch 'dev' of https://github.com/Digital-Hana-Starbucks/Starb…

…ucks_frontend into feature/menu
Digital-Hana-Starbucks · May 8, 2024 · 4fd90ab · 4fd90ab
2 parents 50104ad + 01dc025
commit 4fd90ab
Show file tree

Hide file tree

Showing 40 changed files with 1,361 additions and 9,823 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+yarn.lock
+package-lock.json