docs: resolve conflicts

vitejs · Jul 26, 2023 · f2a97e0 · f2a97e0
1 parent cd14526
commit f2a97e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/guide/features.md b/guide/features.md
@@ -559,11 +559,7 @@ import MyWorker from './worker?worker'
 const worker = new MyWorker()
 ```
 
-<<<<<<< HEAD
-Worker 脚本也可以使用 ESM 的 `import` 语句来替代 `importScripts()` —— **注意**，在开发过程中，这依赖于[浏览器原生支持](https://caniuse.com/?search=module%20worker)（目前在 Firefox 中不支持），而在生产版本中，它已经被编译掉了。
-=======
-The worker script can also use ESM `import` statements instead of `importScripts()`. **Note**: During dev this relies on [browser native support](https://caniuse.com/?search=module%20worker), but for the production build it is compiled away.
->>>>>>> 00eed324d1ca08f62d9e4f62c5ee604ec07317a4
+这个 worker 脚本也可以使用 ESM `import` 语句而不是 `importScripts()`。**注意**：在开发时，这依赖于 [浏览器原生支持](https://caniuse.com/?search=module%20worker)，但是在生产构建中，它会被编译掉。
 
 默认情况下，worker 脚本将在生产构建中编译成单独的 chunk。如果你想将 worker 内联为 base64 字符串，请添加 `inline` 查询参数：
 

diff --git a/guide/static-deploy.md b/guide/static-deploy.md
@@ -336,12 +336,8 @@ $ npx wrangler pages publish dist
 
 ## Flightcontrol
 
-<<<<<<< HEAD
 使用 [Flightcontrol](https://www.flightcontrol.dev/?ref=docs-vite) 部署静态站点，可以按照 [说明](https://www.flightcontrol.dev/docs/reference/examples/vite?ref=docs-vite) 进行操作。
-=======
-Deploy your static site using [Flightcontrol](https://www.flightcontrol.dev/?ref=docs-vite), by following these [instructions](https://www.flightcontrol.dev/docs/reference/examples/vite?ref=docs-vite)
 
-## AWS Amplify Hosting
+## AWS Amplify 部署 {#aws-amplify-hoisting}
 
-Deploy your static site using [AWS Amplify Hosting](https://aws.amazon.com/amplify/hosting/), by following these [instructions](https://docs.amplify.aws/guides/hosting/vite/q/platform/js/)
->>>>>>> 00eed324d1ca08f62d9e4f62c5ee604ec07317a4
+使用 [AWS Amplify 部署](https://aws.amazon.com/amplify/hosting/) 部署静态站点，可以按照 [说明](https://docs.amplify.aws/guides/hosting/vite/q/platform/js/) 进行操作。