iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs(style-guide): fix merge issues 

closes #1244
This commit is contained in:
Foxandxss 2016-05-02 17:28:22 +02:00 committed by Ward Bell
parent 66764fec7e
commit d941353957
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/docs/ts/latest/guide/style-guide.jade
View File

@ -430,14 +430,9 @@ a(href="#toc") Back to top
**Why?** Prevents name collisions. **Why?** Prevents name collisions.
.s-why .s-why
<<<<<<< HEAD
**Why?** Our Components and elements are easily identified.
=======
:marked :marked
**Why?** Makes it easier to promote and share our feature in other apps. **Why?** Makes it easier to promote and share our feature in other apps.
>>>>>>> d76f358... merge conflict fixes
.s-why.s-why-last .s-why.s-why-last
:marked :marked
**Why?** Our Components and elements are easily identified. **Why?** Our Components and elements are easily identified.