Skip to content

Commit 6741cba

Browse files
author
tangmengyu.amber
committed
docs(cn): resolve all conflicts.
1 parent 9040862 commit 6741cba

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

config/preview-options.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,10 @@ export default defineConfig({
7474
- **类型:** `boolean | CorsOptions`
7575
- **默认:** [`server.cors`](#server_proxy)
7676

77-
<<<<<<< HEAD
7877
为开发服务器配置 CORS。此功能默认启用并支持任何来源。可传递一个 [options 对象](https://github.com/expressjs/cors) 来进行配置,或者传递 `false` 来禁用此行为。
79-
=======
80-
Configure CORS for the preview server. This is enabled by default and allows any origin. Pass an [options object](https://github.com/expressjs/cors) to fine tune the behavior or `false` to disable.
8178

82-
## preview.headers
79+
## preview.headers {#preview-headers}
8380

84-
- **Type:** `OutgoingHttpHeaders`
81+
- **类型:** `OutgoingHttpHeaders`
8582

86-
Specify server response headers.
87-
>>>>>>> 1dd27f6f1caeafe48b979c4e7dd38daea456960e
83+
指明服务器返回的响应头。

0 commit comments

Comments
 (0)