resolved deps

Author: thinkasany

package.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -9,9 +8,9 @@
 	"private": true,
 	"license": "CC BY-NC-SA 4.0",
 	"devDependencies": {
-		"@shikijs/vitepress-twoslash": "^3.13.0",
+		"@shikijs/vitepress-twoslash": "^3.14.0",
 		"@type-challenges/utils": "^0.1.1",
-		"@types/express": "^5.0.3",
+		"@types/express": "^5.0.4",
 		"@types/node": "^20.9.2",
 		"chalk": "^4.1.2",
 		"feed": "^5.1.0",
@@ -21,10 +20,10 @@
 		"markdown-it-image-size": "^15.0.1",
 		"vite": "^7.0.4",
 		"vitepress": "^2.0.0-alpha.7",
-		"vitepress-plugin-group-icons": "^1.6.4",
-		"vitepress-plugin-llms": "^1.8.0",
+		"vitepress-plugin-group-icons": "^1.6.5",
+		"vitepress-plugin-llms": "^1.8.1",
 		"vue": "^3.5.22",
-		"vue-tsc": "^3.1.1",
+		"vue-tsc": "^3.1.2",
 		"yorkie": "^2.0.0"
 	},
 	"packageManager": "pnpm@9.6.0",
@@ -40,27 +39,4 @@
 	"gitHooks": {
 		"commit-msg": "node scripts/verifyCommit.js"
 	}
-=======
-  "name": "@vitejs/monorepo-docs",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "typecheck": "vue-tsc",
-    "docs": "vitepress dev",
-    "docs-build": "vitepress build",
-    "docs-serve": "vitepress serve"
-  },
-  "devDependencies": {
-    "@shikijs/vitepress-twoslash": "^3.14.0",
-    "@types/express": "^5.0.4",
-    "feed": "^5.1.0",
-    "gsap": "^3.13.0",
-    "markdown-it-image-size": "^15.0.1",
-    "vitepress": "^2.0.0-alpha.12",
-    "vitepress-plugin-group-icons": "^1.6.5",
-    "vitepress-plugin-llms": "^1.8.1",
-    "vue": "^3.5.22",
-    "vue-tsc": "^3.1.2"
-  }
->>>>>>> 4932528a1ee790ca17435b194b04cf43e5f10fa8
 }