From a5bcd5f5c61e1f45ca778916cf295c52994a3f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B9=8F?= <commdev666@163.com>
Date: Mon, 5 Sep 2022 09:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98=E5=80=BC?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 6d91636..9705d70 100755
--- a/package.json
+++ b/package.json
@@ -4,11 +4,7 @@
   "description": "",
   "private": true,
   "dependencies": {
-<<<<<<< HEAD
     "@cool-midway/core": "^5.1.7",
-=======
-    "@cool-midway/core": "^5.1.5",
->>>>>>> 317fc849c01cfaf6c0e1bc8b9362d0a542727fa8
     "@cool-midway/es": "^5.0.2",
     "@cool-midway/file": "^5.0.7",
     "@cool-midway/pay": "^5.0.0",