Fix remaining merge issues

2018-08-22 13:12:42 +01:00
parent 0248add542
commit d907b40378
7 changed files with 39 additions and 43 deletions
--- 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';