solve conflict

Author: hunterliu1003

example/package.json

@@ -24,12 +24,7 @@
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-vue": "^7.0.0-beta.3",
     "lint-staged": "^9.5.0",
-<<<<<<< HEAD
-    "prettier": "^1.19.1",
-    "vue-template-compiler": "^2.6.11"
-=======
     "prettier": "^1.19.1"
->>>>>>> support vue 3.0
   },
   "gitHooks": {
     "pre-commit": "lint-staged"