Fix additional merge conflicts

2018-08-14 14:39:59 -07:00
parent 2f2582a0da
commit 1d9408a8e0
7 changed files with 135 additions and 33 deletions
--- a/packages/contract-wrappers/test/calldata_optimization_utils_test.ts
+++ b/packages/contract-wrappers/test/calldata_optimization_utils_test.ts
@@ -1,4 +1,4 @@
-import { orderFactory } from '@0xproject/order-utils';
+import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 import 'mocha';