update docs

Signed-off-by: N l00613276 <lian15@huawei.com>

update docs
Signed-off-by: N l00613276 <lian15@huawei.com>
47bb8062 · l00613276 · 4292f16a · 47bb8062
显示空白变更内容
内联并排

Showing with 1 addition and 4 deletion

zh-cn/application-dev/reference/apis/Readme-CN.md zh-cn/application-dev/reference/apis/Readme-CN.md +1 -4

未找到文件。
--- a/zh-cn/application-dev/reference/apis/Readme-CN.md
+++ b/zh-cn/application-dev/reference/apis/Readme-CN.md
@@ -204,10 +204,7 @@
  - [@ohos.arkui.inspector (布局回调)](js-apis-arkui-inspector.md)
  - [ @ohos.arkui.performanceMonitor (性能监测)](js-apis-arkui-performancemonitor.md)
  - [@ohos.arkui.UIContext (UIContext)](js-apis-arkui-UIContext.md)
-<<<<<<< HEAD
-=======
  - [@ohos.arkui.componentUtils (componentUtils)](js-apis-arkui-componentUtils.md)
->>>>>>> 459ea64b239e7532c00f87709ddf528df46113f5
  - [@ohos.curves (插值计算)](js-apis-curve.md)
  - [@ohos.font (注册自定义字体)](js-apis-font.md)
  - [@ohos.matrix4 (矩阵变换)](js-apis-matrix4.md)