Fixed merge conflict from development

2019-01-07 13:08:44 -08:00
parent e39ae0350b
commit 04db7f0fae
3 changed files with 6 additions and 4 deletions
--- 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,