Fixed Lock/Version fix conflicts
This commit is contained in:
parent
5f076bc08d
commit
3acfa01d13
|
@ -1,3 +1,5 @@
|
||||||
node_modules/
|
node_modules/
|
||||||
package-lock.json
|
|
||||||
.env
|
.env
|
||||||
|
yarn.lock
|
||||||
|
package-lock.json
|
||||||
|
pnpm-lock.yaml
|
File diff suppressed because it is too large
Load Diff
1555
backend/yarn.lock
1555
backend/yarn.lock
File diff suppressed because it is too large
Load Diff
|
@ -32,3 +32,6 @@ yarn-error.log*
|
||||||
|
|
||||||
# vercel
|
# vercel
|
||||||
.vercel
|
.vercel
|
||||||
|
yarn.lock
|
||||||
|
package-lock.json
|
||||||
|
pnpm-lock.yaml
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
1487
frontend/yarn.lock
1487
frontend/yarn.lock
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue