cxw-010203

3 years ago · 09cfba1deb
parent 46f5e67da9
commit 09cfba1deb
1 changed files with 1 additions and 5 deletions
--- a/package.json
+++ b/package.json
@ -19,11 +19,7 @@
    "@vant/weapp": "^1.10.3",
    "decimal.js": "^10.3.1",
    "miniprogram-sm-crypto": "^0.3.8",
-<<<<<<< HEAD
-    "moment": "^2.29.3",
+    "moment": "2.29.3",
    "regenerator": "^0.14.7"
-=======
-    "moment": "^2.29.4"
->>>>>>> refs/remotes/origin/dd-7
  }
 }