Updates ionic/ionic-code-style.md

Auto commit by GitBook Editor

Updates ionic/ionic-code-style.md
Auto commit by GitBook Editor
bf99818d · 宋帮潮 · fbc3d836 · bf99818d
Commit bf99818d authored Aug 17, 2017 by 宋帮潮
Show whitespace changes
Inline Side-by-side

Showing with 42 additions and 43 deletions

ionic-code-style.md ionic/ionic-code-style.md +42 -43

No files found.
--- a/ionic/ionic-code-style.md
+++ b/ionic/ionic-code-style.md
-<<<<<<< HEAD
+
 # 前端开发规范
 ---

@@ -39,7 +39,6 @@
 ![](/picture/a1.png)


-=======
 # 前端开发规范
 ---

@@ -84,4 +83,4 @@
 ![](/picture/a2.png)


->>>>>>> 21a37278d7723aa9b04782fd221ddc9df4029858
+