处理冲突

package.json

@@ -43,12 +43,8 @@
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-vue": "^9.0.0",
     "prettier": "^2.5.1",
-<<<<<<< HEAD
-    "typescript": "^4.5.4"
-=======
     "typescript": "^4.5.4",
     "vite-plugin-svg-icons": "^2.0.1"
->>>>>>> 85a73ad8c69b6e2b206544c34083d0e7f3463e91
   },
   "browserslist": [
     "last 10 Chrome versions",