diff options
author | Fabio Berger <me@fabioberger.com> | 2017-06-02 00:14:17 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-06-02 00:14:17 +0800 |
commit | acb8a6c55ee2c97db5d738621929feea759465b3 (patch) | |
tree | 57cfa925d645cb11bb1731381be56d0f66f8f0f1 /tsconfig.json | |
parent | ecf92a4ad786a324d4c8ce9dba926f377766a144 (diff) | |
parent | 389c18e98e2b5663b1732d7c34f9b21afef66e44 (diff) | |
download | dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.gz dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.bz2 dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.lz dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.xz dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.zst dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.zip |
Merge branch 'fillOrderAsync' into unavailableFilledCancelled
# Conflicts:
# src/contract_wrappers/exchange_wrapper.ts
# src/types.ts
# src/utils/assert.ts
Diffstat (limited to 'tsconfig.json')
-rw-r--r-- | tsconfig.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tsconfig.json b/tsconfig.json index b86d0ec6e..6e49168b7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,8 @@ "include": [ "./src/**/*", "./test/**/*", - "./node_modules/web3-typescript-typings/index.d.ts" + "./node_modules/web3-typescript-typings/index.d.ts", + "./node_modules/chai-typescript-typings/index.d.ts", + "./node_modules/chai-as-promised-typescript-typings/index.d.ts" ] } |