merge

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>
             );
         }