update

package.json

@@ -11,7 +11,6 @@
     "lint:nofix": "vue-cli-service lint --no-fix"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@ant-design-vue/pro-layout": "^0.3.4",
     "@antv/data-set": "^0.10.2",
     "ant-design-vue": "^1.6.2",
@@ -36,15 +35,6 @@
     "vue-svg-component-runtime": "^1.0.1",
     "vuex": "^3.1.1",
     "wangeditor": "^3.1.1"
-=======
-    "axios": "^0.21.1",
-    "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
-    "vue": "^2.6.11",
-    "vue-router": "^3.2.0",
-    "vue-wechat-title": "^2.0.7",
-    "vuex": "^3.4.0"
->>>>>>> 6dbed30ef7551a27673167f7e2e193c5e648b348
   },
   "devDependencies": {
     "@ant-design/colors": "^3.2.1",

vue.config.js

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 const path = require('path')
 const webpack = require('webpack')
 const GitRevisionPlugin = require('git-revision-webpack-plugin')
@@ -121,15 +120,3 @@ if (process.env.VUE_APP_PREVIEW === 'true') {
 }
 
 module.exports = vueConfig
-=======
-module.exports = {
-    devServer: {
-        disableHostCheck: false,
-        host: "localhost",
-        port: "8999",
-        https: false,
-        hotOnly: false,
-        proxy: null
-    }
-}
->>>>>>> 6dbed30ef7551a27673167f7e2e193c5e648b348