aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2019-01-08 05:08:44 +0800
committerGreg Hysen <greg.hysen@gmail.com>2019-01-08 07:50:48 +0800
commit04db7f0fae02ef29795d0f65deb71e64b5552233 (patch)
tree6ee5fc237d649116e02da241a3c2ebe3d5029dee /packages/0x.js
parente39ae0350b744227bca73001c90101f0b8613193 (diff)
downloaddexon-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/0x.js')
-rw-r--r--packages/0x.js/src/index.ts1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 790e2a97e..006e4cf29 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -81,6 +81,7 @@ export {
OrderStateInvalid,
OrderState,
AssetProxyId,
+ AssetData,
SingleAssetData,
ERC20AssetData,
ERC721AssetData,