From f8aaf2c2b2aeb1db9c44c385cad6f264b0c704cf Mon Sep 17 00:00:00 2001
From: Mathias Meyer <meyer@paperplanes.de>
Date: Wed, 10 Dec 2014 13:36:11 +0100
Subject: [PATCH] Remove merge conflict remnants.

---
 assets/styles/top.sass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/assets/styles/top.sass b/assets/styles/top.sass
index 9ceae7c0..da4b73b4 100644
--- a/assets/styles/top.sass
+++ b/assets/styles/top.sass
@@ -32,14 +32,10 @@
   a.werehiring
     background-color: #31363d
     border-radius: 4px
-<<<<<<< HEAD
     padding: 8px 16px
     line-height: 20px
     margin-right: 80px
-=======
-    padding: 6px 18px 6px 18px
     display: inline
->>>>>>> b51ca7e50adb765bd44d2ad4aaf52707e4378dfd
 
   li.traviscicom
     a