fix: resolved conflict

Author: thinkasany

config/index.md

@@ -124,7 +124,7 @@ export default defineConfig(({ mode }) => {
 
 ## Debugging the Config File on VS Code
 
-With the default `--configLoader bundle` behavior, Vite writes the generated temporary configuration file to the `node_modules/.vite-temp` folder and a file not found error will occur when setting breakpoint debugging in the Vite config file. To fix the issue, add the following configuration to `.vscode/settings.json`:
+在默认的 `--configLoader bundle` 行为下，Vite 会将生成的临时配置文件写入 `node_modules/.vite-temp` 文件夹，在 Vite 配置文件中设置断点调试时会出现文件未找到的错误。要修复该问题，请在 `.vscode/settings.json` 中添加以下配置：
 
 ```json
 {

package.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -13,7 +12,7 @@
 		"@types/express": "^4.17.21",
 		"feed": "^4.2.2",
 		"vitepress": "^1.6.3",
-		"vitepress-plugin-group-icons": "^1.3.6",
+		"vitepress-plugin-group-icons": "^1.3.7",
 		"vue": "^3.5.13",
 		"@types/node": "^20.9.2",
 		"@type-challenges/utils": "^0.1.1",
@@ -33,22 +32,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": "^2.5.0",
-    "@types/express": "^4.17.21",
-    "feed": "^4.2.2",
-    "vitepress": "^1.6.3",
-    "vitepress-plugin-group-icons": "^1.3.7",
-    "vue": "^3.5.13"
-  }
->>>>>>> 421e971fd16a72efed9acdfc584773c6f950d495
 }