From fa04a7e3c3152d343bedf8b61b827e6de8439fc6 Mon Sep 17 00:00:00 2001
From: waynzh <waynzh19@gmail.com>
Date: Wed, 5 Jun 2024 09:51:39 +0800
Subject: [PATCH] docs(cn): resolve conflicts

---
 docs/configuration-options/index.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md
index cb8962b6d..168b94242 100755
--- a/docs/configuration-options/index.md
+++ b/docs/configuration-options/index.md
@@ -908,19 +908,11 @@ exports.foo = foo;
 
 ### output.hashCharacters
 
-<<<<<<< HEAD
 |        |                                 |
 | -----: | :------------------------------ |
-| 类型： | `"base64" \| "base32" \| "hex"` |
+| 类型： | `"base64" \| "base36" \| "hex"` |
 |  CLI： | `--hashCharacters <name>`       |
 | 默认： | `"base64"`                      |
-=======
-|          |                                 |
-| -------: | :------------------------------ |
-|    Type: | `"base64" \| "base36" \| "hex"` |
-|     CLI: | `--hashCharacters <name>`       |
-| Default: | `"base64"`                      |
->>>>>>> 8ad322cc5ca2c1fe95b2bba41ba74d5aafe8054c
 
 这个选项决定了 Rollup 在生成文件哈希时可以使用的字符集。