fix: modify conflict description

Signed-off-by: N guodongqi <guodongqi2@huawei.com>

fix: modify conflict description
Signed-off-by: N guodongqi <guodongqi2@huawei.com>
f43ef04e · guodongqi · 5f34929f · 5f34929f · f43ef04e
隐藏空白更改
内联并排

Showing with 0 addition and 0 deletion

zh-cn/design/figures/API-Category.png zh-cn/design/figures/API-Category.png +0 -0

未找到文件。
--- a/zh-cn/design/figures/API-Category.png
+++ b/zh-cn/design/figures/API-Category.png