diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2019-01-08 05:08:44 +0800 |
---|---|---|
committer | Greg Hysen <greg.hysen@gmail.com> | 2019-01-08 07:50:48 +0800 |
commit | 04db7f0fae02ef29795d0f65deb71e64b5552233 (patch) | |
tree | 6ee5fc237d649116e02da241a3c2ebe3d5029dee /packages/contract-wrappers/src/index.ts | |
parent | e39ae0350b744227bca73001c90101f0b8613193 (diff) | |
download | dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.gz dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.bz2 dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.lz dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.xz dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.zst dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.zip |
Fixed merge conflict from development
Diffstat (limited to 'packages/contract-wrappers/src/index.ts')
-rw-r--r-- | packages/contract-wrappers/src/index.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts index 853194d6f..69bbe3c91 100644 --- a/packages/contract-wrappers/src/index.ts +++ b/packages/contract-wrappers/src/index.ts @@ -60,9 +60,12 @@ export { export { AssetData, - DutchAuctionDetails, ERC20AssetData, ERC721AssetData, + SingleAssetData, + MultiAssetData, + MultiAssetDataWithRecursiveDecoding, + DutchAuctionDetails, Order, SignedOrder, AssetProxyId, |