From d2745992e5a4df1c92c8cb2edfb9829b7a1cc420 Mon Sep 17 00:00:00 2001
From: ab <abdullah_ahmed@brown.edu>
Date: Sat, 9 Mar 2019 16:07:24 -0500
Subject: idk

---
 src/client/views/ContextMenu.scss | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src')

diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss
index 89351c76c..a83572279 100644
--- a/src/client/views/ContextMenu.scss
+++ b/src/client/views/ContextMenu.scss
@@ -7,15 +7,9 @@
 }
 
 .contextMenu-item {
-<<<<<<< HEAD
     width: 10vw; //10vw
     height: auto; //4vh
     background: #DDDDDD;
-=======
-    width: auto;
-    height: auto;
-    background: #F0F8FF;
->>>>>>> 09928503be98d605052fba65dcd2f91f9b056f23
     display: flex;
     justify-content: left;
     align-items: center;
-- 
cgit v1.2.3-70-g09d2