From 0ba2f7c42e25dd365c0810d5a1abb948c1db769b Mon Sep 17 00:00:00 2001
From: Hannah Chow <hannah_chow@brown.edu>
Date: Tue, 5 Mar 2019 18:16:45 -0500
Subject: ahhhhh

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

(limited to 'package.json')

diff --git a/package.json b/package.json
index b911705ac..0b7d4e86a 100644
--- a/package.json
+++ b/package.json
@@ -32,14 +32,11 @@
     "webpack-hot-middleware": "^2.24.3"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@fortawesome/fontawesome-svg-core": "^1.2.14",
     "@hig/flyout": "^1.0.3",
-=======
     "@fortawesome/fontawesome-svg-core": "^1.2.15",
     "@fortawesome/free-solid-svg-icons": "^5.7.2",
     "@fortawesome/react-fontawesome": "^0.1.4",
->>>>>>> bb1d3120f11a47e9d493202c1003dae52bf6667f
     "@types/bcrypt-nodejs": "0.0.30",
     "@types/bluebird": "^3.5.25",
     "@types/body-parser": "^1.17.0",
@@ -125,4 +122,4 @@
     "url-loader": "^1.1.2",
     "uuid": "^3.3.2"
   }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2