fix: resolved conflict

Author: thinkasany

config/server-options.md

@@ -377,17 +377,13 @@ export default defineConfig({
 
 用于限制 Vite 开发服务器提供敏感文件的黑名单。这会比 [`server.fs.allow`](#server-fs-allow) 选项的优先级更高。同时还支持 [picomatch 模式](https://github.com/micromatch/picomatch#globbing-features)。
 
-<<<<<<< HEAD
-## server.origin {#server-origin}
-=======
 ::: tip NOTE
 
-This blocklist does not apply to [the public directory](/guide/assets.md#the-public-directory). All files in the public directory are served without any filtering, since they are copied directly to the output directory during build.
+此黑名单不适用于[公共目录](/guide/assets.md#the-public-directory)。公共目录中的所有文件均未经任何过滤，因为它们会在构建过程中直接复制到输出目录。
 
 :::
 
-## server.origin
->>>>>>> 4f0ea491bb5fddc10b60b8a39398b2322cf6b30b
+## server.origin {#server-origin}
 
 - **类型：** `string`
 

guide/env-and-mode.md

@@ -2,11 +2,7 @@
 
 Vite 在特殊的 `import.meta.env` 对象下暴露了一些常量。这些常量在开发阶段被定义为全局变量，并在构建阶段被静态替换，以使树摇（tree-shaking）更有效。
 
-<<<<<<< HEAD
 ## 内置常量 {#built-in-constants}
-=======
-## Built-in Constants
->>>>>>> 4f0ea491bb5fddc10b60b8a39398b2322cf6b30b
 
 一些内置常量在所有情况下都可用：
 

guide/ssr.md

@@ -63,11 +63,7 @@ if (import.meta.env.SSR) {
 
 ## 设置开发服务器 {#setting-up-the-dev-server}
 
-<<<<<<< HEAD
-在构建 SSR 应用程序时，你可能希望完全控制主服务器，并将 Vite 与生产环境脱钩。因此，建议以中间件模式使用 Vite。下面是一个关于 [express](https://expressjs.com/) (v4) 的例子：
-=======
-When building an SSR app, you likely want to have full control over your main server and decouple Vite from the production environment. It is therefore recommended to use Vite in middleware mode. Here is an example with [express](https://expressjs.com/):
->>>>>>> 4f0ea491bb5fddc10b60b8a39398b2322cf6b30b
+在构建 SSR 应用程序时，你可能希望完全控制主服务器，并将 Vite 与生产环境脱钩。因此，建议以中间件模式使用 Vite。下面是一个关于 [express](https://expressjs.com/) 的例子：
 
 ```js{15-18} twoslash [server.js]
 import fs from 'node:fs'
@@ -97,13 +93,8 @@ async function createServer() {
   // 即使在重新启动后，以下内容仍然有效。
   app.use(vite.middlewares)
 
-<<<<<<< HEAD
-  app.use('*', async (req, res) => {
-    // 服务 index.html - 下面我们来处理这个问题
-=======
   app.use('*all', async (req, res) => {
-    // serve index.html - we will tackle this next
->>>>>>> 4f0ea491bb5fddc10b60b8a39398b2322cf6b30b
+    // 服务 index.html - 下面我们来处理这个问题
   })
 
   app.listen(5173)

package.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -10,7 +9,7 @@
 	"license": "CC BY-NC-SA 4.0",
 	"devDependencies": {
 		"@shikijs/vitepress-twoslash": "^2.5.0",
-		"@types/express": "^4.17.21",
+		"@types/express": "^5.0.1",
 		"feed": "^4.2.2",
 		"vitepress": "^1.6.3",
 		"vitepress-plugin-group-icons": "^1.5.2",
@@ -34,23 +33,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": "^5.0.1",
-    "feed": "^4.2.2",
-    "vitepress": "^1.6.3",
-    "vitepress-plugin-group-icons": "^1.5.2",
-    "vitepress-plugin-llms": "^1.1.0",
-    "vue": "^3.5.13"
-  }
->>>>>>> 4f0ea491bb5fddc10b60b8a39398b2322cf6b30b
 }