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

---
 tsconfig.json | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tsconfig.json')

diff --git a/tsconfig.json b/tsconfig.json
index 2989a9509..41db1d0a7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,11 +10,7 @@
     "lib": [
       "dom",
       "es2015"
-<<<<<<< HEAD
     ],
-=======
-    ]
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
   },
   // "exclude": [
   //   "node_modules",
-- 
cgit v1.2.3-70-g09d2