From 04db7f0fae02ef29795d0f65deb71e64b5552233 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Mon, 7 Jan 2019 13:08:44 -0800
Subject: Fixed merge conflict from development

---
 packages/0x.js/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/0x.js/src')

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,
-- 
cgit v1.2.3