Updates ionic/app.md

Auto commit by GitBook Editor

Updates ionic/app.md
Auto commit by GitBook Editor
2a9b5645 · Anonymous · 5f147e75 · 2a9b5645
Commit 2a9b5645 authored Aug 16, 2017 by Anonymous
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app.md ionic/app.md +1 -4

No files found.
--- a/ionic/app.md
+++ b/ionic/app.md
-<<<<<<< HEAD
+
 # app目录介绍

 app:.
@@ -80,7 +80,6 @@ app:.



-=======
 # app目录介绍

 ---
@@ -134,5 +133,3 @@ app:.
    * `项目页面的样式引入，例子：（@import "../pages/tools/qiXin-bao/qiXin-detail/management-information/growth-process";）`


-
->>>>>>> b086492be6a234e8e7f1408fcbeec39e95809fd5