Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

docs(style-guide): fix merge issues #1244

Closed
wants to merge 1 commit into from
Closed

docs(style-guide): fix merge issues #1244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions public/docs/ts/latest/guide/style-guide.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,9 @@ a(href="#toc") Back to top
**Why?** Prevents name collisions.

.s-why
<<<<<<< HEAD
**Why?** Our Components and elements are easily identified.

=======
:marked
**Why?** Makes it easier to promote and share our feature in other apps.

>>>>>>> d76f358... merge conflict fixes
.s-why.s-why-last
:marked
**Why?** Our Components and elements are easily identified.
Expand Down