From d907b403788576c7d4fe51090a561f1e951126e2 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 22 Aug 2018 13:12:42 +0100
Subject: Fix remaining merge issues

---
 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 a37333bad..7058a898f 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -41,6 +41,7 @@ export {
     EventCallback,
     DecodedLogEvent,
     ExchangeEventArgs,
+    TransactionEncoder,
 } from '@0xproject/contract-wrappers';
 
 export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';
-- 
cgit