aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-07-18 22:44:24 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-07-18 22:44:24 +0800
commit9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9 (patch)
tree5d451144b4fd6b188875d6b02fe2119410ab2f16
parent86328af6b78bbb8abba97d8ed495f2183cd38c74 (diff)
downloaddexon-sol-tools-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar
dexon-sol-tools-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar.gz
dexon-sol-tools-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar.bz2
dexon-sol-tools-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar.lz
dexon-sol-tools-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar.xz
dexon-sol-tools-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.tar.zst
dexon-sol-tools-9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9.zip
Fixed merge errors
-rw-r--r--packages/contracts/test/asset_proxy/proxies.ts2
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();