From 09cfba1debc306a62e6602a6fe21d80489bf7103 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Fri, 19 Aug 2022 17:30:54 +0800
Subject: [PATCH] cxw-010203

---
 package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 13de65e..53cbdf1 100644
--- 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
   }
 }