docs(cn): dissolve the conflict

Author: NoiseFan

config/browser/locators.md

@@ -12,11 +12,8 @@ outline: deep
 - **类型:** `string`
 - **默认值:** `data-testid`
 
-<<<<<<< HEAD
 用于通过 `getByTestId` 定位器查找元素的属性。
-=======
-Attribute used to find elements with `getByTestId` locator.
-
+<!-- TODO: translation -->
 ## browser.locators.exact <Version type="experimental">4.1.3</Version> {#browser-locators-exact}
 
 - **Type:** `boolean`
@@ -30,4 +27,3 @@ When set to `true`, [locators](/api/browser/locators) will match text exactly by
 const locator = page.getByText('Hello, World', { exact: true })
 await locator.click()
 ```
->>>>>>> ab4222a4c4bd8d175537000fb1b0f6b7334065c3

guide/cli-generated.md

@@ -428,7 +428,7 @@ Directory of HTML coverage output to be served in UI mode and HTML reporter.
 - **配置:** [browser.trace](/config/browser/trace)
 
 启用追踪视图模式。 可选项: "on", "off", "on-first-retry", "on-all-retries", "retain-on-failure"
-
+<!-- TODO: translation -->
 ### browser.locators.exact
 
 - **CLI:** `--browser.locators.exact`

guide/ui.md

@@ -52,10 +52,7 @@ npx vite preview --outDir ./html
 
 你可以使用 [`outputFile`](/config/outputfile) 配置选项配置输出。你需要在那里指定 `.html` 路径。例如，`./html/index.html` 是默认值。
 :::
-
-<<<<<<< HEAD
-## 模块图 {#module-graph}
-=======
+<!-- TODO: translation -->
 ::: tip
 To view the HTML report from CI, for example in GitHub Actions, upload the output directory as an artifact:
 
@@ -73,8 +70,7 @@ To view the HTML report from CI, for example in GitHub Actions, upload the outpu
 This adds a link to the job summary. Click it to open the report in [Vitest Viewer](https://viewer.vitest.dev/) directly in the browser. You can also download the artifact manually and extract it, then run `vite preview` locally as above.
 :::
 
-## Module Graph
->>>>>>> ab4222a4c4bd8d175537000fb1b0f6b7334065c3
+## 模块图 {#module-graph}
 
 模块图选项卡显示所选测试文件的模块图。