diff options
| author | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-04-13 19:11:49 -0400 |
|---|---|---|
| committer | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-04-13 19:11:49 -0400 |
| commit | 35f09470b2939a6640b85c94a9a4ea2551a6ea42 (patch) | |
| tree | 5beb6aaaa2198d28d30bce288f9041398d6d4f84 /tsconfig.json | |
| parent | 8c58ff299e371c70147aa8123ed9fb0ae1a9e880 (diff) | |
| parent | c392a9322c1df269cfd823dd82d07d991fe065c0 (diff) | |
resolved merge conflicts
Diffstat (limited to 'tsconfig.json')
| -rw-r--r-- | tsconfig.json | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/tsconfig.json b/tsconfig.json index 41db1d0a7..0d4d77002 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,23 +1,23 @@ { - "compilerOptions": { - "target": "es5", - "removeComments": true, - "experimentalDecorators": true, - "strict": true, - "jsx": "react", - "sourceMap": true, - "outDir": "dist", - "lib": [ - "dom", - "es2015" - ], - }, - // "exclude": [ - // "node_modules", - // "static" - // ], - "typeRoots": [ - "./node_modules/@types", - "./src/typings" - ] + "compilerOptions": { + "target": "es5", + "removeComments": true, + "experimentalDecorators": true, + "strict": true, + "jsx": "react", + "sourceMap": true, + "outDir": "dist", + "lib": [ + "dom", + "es2015" + ], + }, + // "exclude": [ + // "node_modules", + // "static" + // ], + "typeRoots": [ + "./node_modules/@types", + "./src/typings" + ] }
\ No newline at end of file |