aboutsummaryrefslogtreecommitdiff
path: root/tsconfig.json
diff options
context:
space:
mode:
authorab <abdullah_ahmed@brown.edu>2019-03-09 16:23:12 -0500
committerab <abdullah_ahmed@brown.edu>2019-03-09 16:23:12 -0500
commitbfa7f71544c02201b2f793e3907ad0734e311f51 (patch)
tree177adaf1e3c416e29e09cdf468190d22d1229193 /tsconfig.json
parent70676c2456f7f330869d6009b52456aba10e7e97 (diff)
hi
Diffstat (limited to 'tsconfig.json')
-rw-r--r--tsconfig.json4
1 files changed, 0 insertions, 4 deletions
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",