diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-07-18 22:44:24 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-07-18 22:44:24 +0800 |
| commit | 9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9 (patch) | |
| tree | 5d451144b4fd6b188875d6b02fe2119410ab2f16 /packages/contracts/test/asset_proxy | |
| parent | 86328af6b78bbb8abba97d8ed495f2183cd38c74 (diff) | |
| download | dexon-0x-contracts-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar.gz dexon-0x-contracts-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar.zst dexon-0x-contracts-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.zip | |
Fixed merge errors
Diffstat (limited to 'packages/contracts/test/asset_proxy')
| -rw-r--r-- | packages/contracts/test/asset_proxy/proxies.ts | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts index 1a24ee0b6..62215f08d 100644 --- a/packages/contracts/test/asset_proxy/proxies.ts +++ b/packages/contracts/test/asset_proxy/proxies.ts @@ -3,7 +3,6 @@ import { assetDataUtils } from '@0xproject/order-utils'; import { RevertReason } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; -import { LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token'; @@ -19,7 +18,6 @@ import { constants } from '../utils/constants'; import { ERC20Wrapper } from '../utils/erc20_wrapper'; import { ERC721Wrapper } from '../utils/erc721_wrapper'; import { LogDecoder } from '../utils/log_decoder'; -import { typeEncodingUtils } from '../utils/type_encoding_utils'; import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper'; chaiSetup.configure(); |