aboutsummaryrefslogtreecommitdiff
path: root/tsconfig.json
diff options
context:
space:
mode:
authorab <abdullah_ahmed@brown.edu>2019-03-09 15:59:36 -0500
committerab <abdullah_ahmed@brown.edu>2019-03-09 15:59:36 -0500
commit30b082a9d94465ae24d9c392843518e8df2c9d66 (patch)
tree01c464b96defe06b2c99e8e298b9287901d4d9b0 /tsconfig.json
parent12d20ab1b9b843d816bde445d9b67b3aa6abc6ae (diff)
parent96eede5f7d1706a3f7ac6ee02a85bb3da217f467 (diff)
merging
Diffstat (limited to 'tsconfig.json')
-rw-r--r--tsconfig.json14
1 files changed, 11 insertions, 3 deletions
diff --git a/tsconfig.json b/tsconfig.json
index e30f80b14..2989a9509 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,10 +10,18 @@
"lib": [
"dom",
"es2015"
+<<<<<<< HEAD
],
+=======
+ ]
+>>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
},
- "exclude": [
- "node_modules",
- "static"
+ // "exclude": [
+ // "node_modules",
+ // "static"
+ // ],
+ "typeRoots": [
+ "./node_modules/@types",
+ "./src/typings"
]
} \ No newline at end of file