diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-05-30 20:48:10 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-05-30 20:48:10 +0800 |
| commit | 1f09470838342e4b9d493b9ddc2eecf65409483e (patch) | |
| tree | 4ef197dc2e45fa79f6b5c7686fd88037d519c290 /test/exchange_wrapper.ts | |
| parent | f4bc7ecf5f72ee32931cf4fa44fffb50505d696d (diff) | |
| parent | 6b321ca1c70b9dcf188b2a112015386cba0ad5f2 (diff) | |
| download | dexon-sol-tools-1f09470838342e4b9d493b9ddc2eecf65409483e.tar dexon-sol-tools-1f09470838342e4b9d493b9ddc2eecf65409483e.tar.gz dexon-sol-tools-1f09470838342e4b9d493b9ddc2eecf65409483e.tar.bz2 dexon-sol-tools-1f09470838342e4b9d493b9ddc2eecf65409483e.tar.lz dexon-sol-tools-1f09470838342e4b9d493b9ddc2eecf65409483e.tar.xz dexon-sol-tools-1f09470838342e4b9d493b9ddc2eecf65409483e.tar.zst dexon-sol-tools-1f09470838342e4b9d493b9ddc2eecf65409483e.zip | |
Merge branch 'master' into erc20Wrapper
# Conflicts:
# src/0x.js.ts
Diffstat (limited to 'test/exchange_wrapper.ts')
| -rw-r--r-- | test/exchange_wrapper.ts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/exchange_wrapper.ts b/test/exchange_wrapper.ts index 4bfc49374..55b84ce36 100644 --- a/test/exchange_wrapper.ts +++ b/test/exchange_wrapper.ts @@ -1,7 +1,6 @@ import 'mocha'; import * as chai from 'chai'; import chaiAsPromised = require('chai-as-promised'); -import * as Web3 from 'web3'; import {web3Factory} from './utils/web3_factory'; import {ZeroEx} from '../src/0x.js'; import {BlockchainLifecycle} from './utils/blockchain_lifecycle'; |