From c6aa275868c250affa4f335996beefe73f59c999 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Tue, 6 Aug 2019 17:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json  | 4 +---
 vue.config.js | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 8a47f7359..b60ad8f15 100644
--- a/package.json
+++ b/package.json
@@ -63,9 +63,7 @@
     "serve-static": "^1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.2",
-    "vue-template-compiler": "2.6.10",
-    "webpack-merge": "4.1.1",
-    "babel-helper-vue-jsx-merge-props": "2.0.3"
+    "vue-template-compiler": "2.6.10"
   },
   "engines": {
     "node": ">=8.9",
diff --git a/vue.config.js b/vue.config.js
index 34b437cdf..c52e95015 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,7 +4,6 @@
 const path = require('path');
 const defaultSettings = require('./src/settings.js');
 
-const merge = require('webpack-merge');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 function resolve(dir) {