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/0x.js | |
| parent | e39ae0350b744227bca73001c90101f0b8613193 (diff) | |
| download | dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.gz 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.ts | 1 |
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, |