docs(cn): dissolve the conflict

Author: NoiseFan

api/expect.md

@@ -782,27 +782,19 @@ test('the number of elements must match exactly', () => {
 
 ## toThrowError
 
-<<<<<<< HEAD
-- **类型:** `(received: any) => Awaitable<void>`
-=======
-- **Type:** `(expected?: any) => Awaitable<void>`
->>>>>>> 6777bfb4d65ef81facc3a8f09bbe129e90871655
+- **类型:** `(recexpectedeived: any) => Awaitable<void>`
 
 - **别名:** `toThrow`
 
 `toThrowError` 断言函数在被调用时是否会抛出错误。
 
 我们可以提供一个可选参数来测试是否抛出了特定的错误：
 
-<<<<<<< HEAD
 - `RegExp`: 错误消息匹配该模式
 - `string`: 错误消息包含该子字符串
-- `Error`, `AsymmetricMatcher`: 与接收到的对象进行比较，类似于 `toEqual(received)`
-=======
-- `RegExp`: error message matches the pattern
-- `string`: error message includes the substring
 - any other value: compare with thrown value using deep equality (similar to `toEqual`)
->>>>>>> 6777bfb4d65ef81facc3a8f09bbe129e90871655
+
+<!-- TODO: translation -->
 
 :::tip
 必须将代码包装在一个函数中，否则错误将无法被捕获，测试将失败。
@@ -863,6 +855,8 @@ test('throws on pineapples', async () => {
 
 :::
 
+<!-- TODO: translation -->
+
 :::tip
 You can also test non-Error values that are thrown:
 

eslint.config.js

@@ -69,6 +69,7 @@ export default antfu(
       'no-self-compare': 'off',
       'import/no-mutable-exports': 'off',
       'no-restricted-globals': 'off',
+      'no-throw-literal': 'off',
     },
   },
 )