update:合并

This commit is contained in:
2021-09-10 15:11:09 +08:00
parent 5089cde8bc
commit 837f86c25c
2 changed files with 1 additions and 43 deletions

View File

@@ -11,13 +11,10 @@
},
"dependencies": {
"axios": "^0.21.4",
<<<<<<< Updated upstream
"js-md5": "^0.7.3",
=======
"element-ui": "^2.15.6",
"js-md5": "^0.7.3",
"less": "^4.1.1",
"less-loader": "^4.1.0",
>>>>>>> Stashed changes
"lib-flexible": "^0.3.2",
"px2rem-loader": "^0.1.9",
"vant": "^2.12.27",