From 87eb66e7b3823ed02f98d9d844717fedc06325d9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 30 Apr 2018 09:49:51 +0100
Subject: [PATCH] removed conflict markers

---
 app/assets/stylesheets/pages/repo.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 2077cb5ea8d..dfdeaf34d02 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -68,8 +68,6 @@
       }
     }
 
-<<<<<<< HEAD
-=======
     .ide-file-icon-holder {
       display: flex;
       align-items: center;
@@ -83,7 +81,6 @@
       }
     }
 
->>>>>>> master
     .ide-new-btn {
       display: none;
       margin-right: -8px;