mirror of
https://github.com/dborth/vbagx.git
synced 2025-02-16 18:59:12 +01:00
Merge branch 'main' of https://github.com/askotx/comida-cab-f7-v6 into main
This commit is contained in:
commit
24a6c58225
3949
package-lock.json
generated
3949
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -43,12 +43,21 @@
|
|||||||
"@babel/plugin-transform-runtime": "^7.17.0",
|
"@babel/plugin-transform-runtime": "^7.17.0",
|
||||||
"@babel/preset-env": "^7.16.11",
|
"@babel/preset-env": "^7.16.11",
|
||||||
"@babel/preset-react": "^7.16.7",
|
"@babel/preset-react": "^7.16.7",
|
||||||
|
<<<<<<< HEAD
|
||||||
"@babel/runtime": "^7.17.9",
|
"@babel/runtime": "^7.17.9",
|
||||||
"babel-loader": "^8.2.4",
|
"babel-loader": "^8.2.4",
|
||||||
"chalk": "^5.0.1",
|
"chalk": "^5.0.1",
|
||||||
"concurrently": "^7.1.0",
|
"concurrently": "^7.1.0",
|
||||||
"copy-webpack-plugin": "^10.2.4",
|
"copy-webpack-plugin": "^10.2.4",
|
||||||
"cpy-cli": "^4.1.0",
|
"cpy-cli": "^4.1.0",
|
||||||
|
=======
|
||||||
|
"@babel/runtime": "^7.16.7",
|
||||||
|
"babel-loader": "^8.2.3",
|
||||||
|
"chalk": "^5.0.0",
|
||||||
|
"concurrently": "^7.0.0",
|
||||||
|
"copy-webpack-plugin": "^10.2.1",
|
||||||
|
"cpy-cli": "^3.1.1",
|
||||||
|
>>>>>>> 41664d03d622bfea2d43841bf1504d70a0fb33fa
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"css-loader": "^6.7.1",
|
"css-loader": "^6.7.1",
|
||||||
"css-minimizer-webpack-plugin": "^3.4.1",
|
"css-minimizer-webpack-plugin": "^3.4.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user