!7360 fix: modify conflict description

Merge pull request !7360 from 郭东奇/master

!7360 fix: modify conflict description
Merge pull request !7360 from 郭东奇/master
cc45c4d1 · openharmony_ci · Gitee · ec7c4aa5 · f43ef04e · ec7c4aa5
隐藏空白更改
内联并排

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