From bfa7f71544c02201b2f793e3907ad0734e311f51 Mon Sep 17 00:00:00 2001
From: ab <abdullah_ahmed@brown.edu>
Date: Sat, 9 Mar 2019 16:23:12 -0500
Subject: hi

---
 package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index aca70e2e6..e1a9cc6fb 100644
--- a/package.json
+++ b/package.json
@@ -112,11 +112,7 @@
     "pug": "^2.0.3",
     "raw-loader": "^1.0.0",
     "react": "^16.5.2",
-<<<<<<< HEAD
-    "react-contenteditable": "^3.2.6",
-=======
     "react-color": "^2.17.0",
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
     "react-dimensions": "^1.3.1",
     "react-dom": "^16.7.0",
     "react-golden-layout": "^1.0.6",
@@ -135,4 +131,4 @@
     "url-loader": "^1.1.2",
     "uuid": "^3.3.2"
   }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2