Skip to content

Commit 713f5a5

Browse files
committed
docs(cn): fix conflicts
1 parent bbc0846 commit 713f5a5

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

config/index.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,8 @@ export default defineConfig(async ({ command, mode }) => {
375375

376376
### server.port {#server-port}
377377

378-
<<<<<<< HEAD
379378
- **类型:** `number`
380-
=======
381-
- **Type:** `number`
382-
- **Default:** `3000`
383-
>>>>>>> 703de0fafb4d9fc34f86b4ea425e6e3b05ddf286
379+
- **默认值:** `3000`
384380

385381
指定开发服务器端口。注意:如果端口已经被使用,Vite 会自动尝试下一个可用的端口,所以这可能不是开发服务器最终监听的实际端口。
386382

0 commit comments

Comments
 (0)