From a069249d987f05b8bb8b0d6089bf72720ecc3f27 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 14 May 2019 14:03:31 +1000
Subject: [PATCH] merge

---
 client/src/components/instance.cryps.jsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/client/src/components/instance.cryps.jsx b/client/src/components/instance.cryps.jsx
index 473cad75..853a5af8 100644
--- a/client/src/components/instance.cryps.jsx
+++ b/client/src/components/instance.cryps.jsx
@@ -111,15 +111,9 @@ function Cryp(props) {
         if (!s) {
             const equip = specList.includes(vbox.bound[activeVar]) ? 'equip-spec' : 'gray';
             return (
-<<<<<<< HEAD
-                <figure key={i} className="gray" onClick={blankSpecClick}>
-                    {shapes.diamond('stat-icon gray')}
-                    <figcaption>+</figcaption>
-=======
                 <figure key={i} onClick={blankSpecClick}>
                     {shapes.diamond(`stat-icon ${equip}`)}
-                    <figcaption>&nbsp;</figcaption>
->>>>>>> 2318ff3974d80a7c29246cdc8a3eb1653ea45b91
+                    <figcaption>+</figcaption>
                 </figure>
             );
         }