chore: update deps

package.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -16,10 +15,10 @@
 		"vite": "^5.1.6",
 		"feed": "^4.2.2",
 		"yorkie": "^2.0.0",
-    "@shikijs/vitepress-twoslash": "^1.3.0",
+    "@shikijs/vitepress-twoslash": "^1.4.0",
     "@types/express": "^4.17.21",
-    "vitepress": "1.1.3",
-    "vue": "^3.4.24"
+    "vitepress": "1.1.4",
+    "vue": "^3.4.26"
 	},
 	"scripts": {
 		"dev": "vitepress dev .",
@@ -29,20 +28,4 @@
 	"gitHooks": {
 		"commit-msg": "node scripts/verifyCommit.js"
 	}
-=======
-  "name": "docs",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "docs": "vitepress dev",
-    "docs-build": "vitepress build",
-    "docs-serve": "vitepress serve"
-  },
-  "devDependencies": {
-    "@shikijs/vitepress-twoslash": "^1.4.0",
-    "@types/express": "^4.17.21",
-    "vitepress": "1.1.4",
-    "vue": "^3.4.27"
-  }
->>>>>>> 20f5d16b15b63d6a0b4f1ef42ed66a150c2a5508
 }