Conflict resolution

a4de64cc · Jefferyne · 2749f2ec · c6f1eaa8 · a4de64cc
Commit a4de64cc authored Aug 03, 2017 by Jefferyne
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

融租易开发手册.md 融租易开发手册.md +3 -3

No files found.
--- a/融租易开发手册.md
+++ b/融租易开发手册.md
@@ -49,11 +49,11 @@
     * [5.12 hlsForm(表单)](/前端组件/hlsForm.md)
     * [5.13 hlsCombobox](/前端组件/hlsCombobox.md)
     * [5.14 hlsCheckBox(复选框)](/前端组件/hlsCheckBox.md)
-     * [5.15 Grid](/前端组件/Grid.md)
-     * [5.16 DataSource](/前端组件/DataSource.md)
+     * [5.15 grid](/前端组件/Grid.md)
+     * [5.16 dataSource](/前端组件/DataSource.md)
     * [5.17 hlsGridBox](/前端组件/hlsGridBox.md)
     * [5.18 NumericTextBx](/前端组件/NumericTextBox.md)
-     * [5.19 HlsNavigationBar](/前端组件/HlsNavigationBar.md)
+     * [5.19 hlsNavigationBar](/前端组件/HlsNavigationBar.md)
  
 * VI. 框架功能描述