From dc772f3fae2d65e5b532b4283227bcce92d4a6bb Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 28 Jun 2018 11:32:32 +0200
Subject: [PATCH] Update compile-tab.js

---
 src/app/tabs/compile-tab.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js
index d61a634a06..d425a9bfdd 100644
--- a/src/app/tabs/compile-tab.js
+++ b/src/app/tabs/compile-tab.js
@@ -384,10 +384,6 @@ const css = csjs`
   .contractHelperButtons {
     display: flex;
     cursor: pointer;
-<<<<<<< HEAD
-=======
-    justify-content: space-between;
->>>>>>> cbfc5f1... Added copy buttons for ABI and Bytecode
     text-align: center;
   }
   .copyButton {