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/contract-wrappers/src/index.ts | 5 ++++-
 packages/contract-wrappers/src/types.ts | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'packages/contract-wrappers')

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 853194d6f..69bbe3c91 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -60,9 +60,12 @@ export {
 
 export {
     AssetData,
-    DutchAuctionDetails,
     ERC20AssetData,
     ERC721AssetData,
+    SingleAssetData,
+    MultiAssetData,
+    MultiAssetDataWithRecursiveDecoding,
+    DutchAuctionDetails,
     Order,
     SignedOrder,
     AssetProxyId,
diff --git a/packages/contract-wrappers/src/types.ts b/packages/contract-wrappers/src/types.ts
index f23587c20..945ca88cd 100644
--- a/packages/contract-wrappers/src/types.ts
+++ b/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',
 }
-- 
cgit v1.2.3