From d9413539572a3c6cf3e1cf064f08835d1fbe8378 Mon Sep 17 00:00:00 2001
From: Foxandxss <foxandxss@gmail.com>
Date: Mon, 2 May 2016 17:28:22 +0200
Subject: [PATCH] docs(style-guide): fix merge issues closes #1244

---
 public/docs/ts/latest/guide/style-guide.jade | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/docs/ts/latest/guide/style-guide.jade b/public/docs/ts/latest/guide/style-guide.jade
index c286bc6615..e53aa097cf 100644
--- a/public/docs/ts/latest/guide/style-guide.jade
+++ b/public/docs/ts/latest/guide/style-guide.jade
@@ -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.