Fixed Lock/Version fix conflicts

2022-03-06 21:38:11 +05:30 · 2022-03-06 21:38:11 +05:30 · 3acfa01d13
parent 5f076bc08d
commit 3acfa01d13
7 changed files with 6 additions and 11101 deletions
--- a/backend/.gitignore
+++ b/backend/.gitignore
@ -1,3 +1,5 @@
 node_modules/
-package-lock.json
 .env
+yarn.lock
+package-lock.json
+pnpm-lock.yaml
--- a/backend/pnpm-lock.yaml
+++ b/backend/pnpm-lock.yaml
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@ -32,3 +32,6 @@ yarn-error.log*

 # vercel
 .vercel
+yarn.lock
+package-lock.json
+pnpm-lock.yaml
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock