fix merge

This commit is contained in:
Fabio Berger
2017-11-13 17:14:07 -05:00

View File

@@ -2,7 +2,7 @@
"compilerOptions": { "compilerOptions": {
"module": "commonjs", "module": "commonjs",
"target": "es5", "target": "es5",
"lib": [ "es2017"], "lib": [ "es2017", "dom"],
"outDir": "lib", "outDir": "lib",
"sourceMap": true, "sourceMap": true,
"declaration": true, "declaration": true,
@@ -12,7 +12,7 @@
"include": [ "include": [
"./src/**/*", "./src/**/*",
"./test/**/*", "./test/**/*",
"../../node_modules/chai-typescript-typings/index.d.ts", "../../node_modules/chai-typescript-typings/index.d.ts",
"../../node_modules/web3-typescript-typings/index.d.ts" "../../node_modules/web3-typescript-typings/index.d.ts"
] ]
} }