From d75539cede2f9a87e372c636d7d5afab99f32591 Mon Sep 17 00:00:00 2001
From: liuminjian <xxb_lmj@jiajiayue.com>
Date: Fri, 23 Jul 2021 09:11:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/package.json b/package.json
index 53bb8e5a..ead2e8df 100644
--- a/package.json
+++ b/package.json
@@ -11,11 +11,8 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-<<<<<<< HEAD
     "jquery": "^3.6.0",
-=======
     "global": "^4.4.0",
->>>>>>> e0b10598d66107bf1e5143918ed011a0be798972
     "js-cookie": "^2.2.1",
     "lib-flexible": "^0.3.2",
     "node-sass": "^5.0.0",
@@ -79,4 +76,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}
\ No newline at end of file