From 5c720f2e01bc87fe54b2fcafe617873cc5dcffe4 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Wed, 2 Oct 2013 15:45:41 -0400
Subject: [PATCH] cosmetic error on homepage

---
 node/src/documents/index.html.eco | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/node/src/documents/index.html.eco b/node/src/documents/index.html.eco
index 8698ddcd3..363abdae3 100755
--- a/node/src/documents/index.html.eco
+++ b/node/src/documents/index.html.eco
@@ -14,11 +14,7 @@ type   : 'Semantic'
   <div class="ui page grid">
     <div class="column">
       <div class="introduction">
-<<<<<<< HEAD
-        <h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.3.1</a></h1>
-=======
         <h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.3.2</a></h1>
->>>>>>> 8cb6cb16d45d08fcf5dc1cf71ea949de3f10fd99
         <h2 class="ui header">UI is the vocabulary of the web.</h2>
         <p>Semantic empowers designers and developers by creating a language for sharing UI.</p>
         <a class="ui black large labeled launch icon button"><i class="icon list layout"></i> View UI</a>