Fixed merge conflict from development

packages/0x.js/src/index.ts

@@ -81,6 +81,7 @@ export {
     OrderStateInvalid,
     OrderState,
     AssetProxyId,
+    AssetData,
     SingleAssetData,
     ERC20AssetData,
     ERC721AssetData,

packages/contract-wrappers/src/index.ts

@@ -60,9 +60,12 @@ export {
 
 export {
     AssetData,
-    DutchAuctionDetails,
     ERC20AssetData,
     ERC721AssetData,
+    SingleAssetData,
+    MultiAssetData,
+    MultiAssetDataWithRecursiveDecoding,
+    DutchAuctionDetails,
     Order,
     SignedOrder,
     AssetProxyId,

packages/contract-wrappers/src/types.ts

@@ -9,13 +9,11 @@ import {
     WETH9Events,
 } from '@0x/abi-gen-wrappers';
 import { ContractAddresses } from '@0x/contract-addresses';
-import { OrderState, SignedOrder } from '@0x/types';
+import { AssetData, OrderState, SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 
 import { BlockParam, ContractEventArg, DecodedLogArgs, LogEntryEvent, LogWithDecodedArgs } from 'ethereum-types';
 
-import { AssetData } from '@0x/order-utils';
-
 export enum ExchangeWrapperError {
     AssetDataMismatch = 'ASSET_DATA_MISMATCH',
 }