处理冲突

a2f487ef · 罗超 · 1641919e · a2f487ef
Commit a2f487ef authored Nov 02, 2022 by 罗超
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

package.json package.json +0 -4

No files found.
--- a/package.json
+++ b/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",