From e8648050617e1df3c302abc763f6e1da5d3d5835 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 9 Nov 2023 15:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E7=94=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
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 29145f6f6..36b100f0f 100644
--- a/package.json
+++ b/package.json
@@ -48,10 +48,6 @@
     "@wecom/jssdk": "^1.3.2",
     "axios": "^1.4.0",
     "clipboard": "^2.0.11",
-<<<<<<< HEAD
-=======
-    "echarts": "^5.4.3",
->>>>>>> v3
     "element-plus": "^2.3.4",
     "font-awesome": "^4.7.0",
     "echarts": "^5.4.3",