From 75f33fa8f030c5e6e42e88cc558b26571ec269f0 Mon Sep 17 00:00:00 2001
From: xycccch <xycccch@qq.com>
Date: Tue, 11 Jan 2022 16:09:31 +0800
Subject: [PATCH] Update package.json

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

diff --git a/package.json b/package.json
index a58ff1f..75592b0 100644
--- a/package.json
+++ b/package.json
@@ -13,30 +13,6 @@
   },
   "dependencies": {
     "axios": "^0.18.1",
-<<<<<<< Updated upstream
-    "core-js": "3.6.5",
-    "element-ui": "2.13.2",
-    "js-cookie": "2.2.0",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "path-browserify": "^1.0.1",
-    "path-to-regexp": "2.4.0",
-    "vite-plugin-svg-icons": "^1.1.0",
-    "vue": "2.6.10",
-    "vue-router": "3.0.6",
-    "vuex": "3.1.0"
-  },
-  "devDependencies": {
-    "@vue/compiler-sfc": "^3.2.26",
-    "autoprefixer": "9.5.1",
-    "chalk": "2.4.2",
-    "eslint": "6.7.2",
-    "eslint-plugin-vue": "6.2.2",
-    "mockjs": "1.0.1-beta3",
-    "runjs": "4.3.2",
-    "sass": "1.26.8",
-    "serve-static": "1.13.2",
-=======
     "core-js": "^3.6.5",
     "element-ui": "^2.13.2",
     "js-cookie": "^2.2.0",
@@ -59,7 +35,6 @@
     "runjs": "^4.3.2",
     "sass": "^1.26.8",
     "serve-static": "^1.13.2",
->>>>>>> Stashed changes
     "vite": "^2.7.10",
     "vite-plugin-vue2": "^1.9.2",
     "vue-template-compiler": "^2.6.10"