aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract-wrappers
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-08-15 05:39:59 +0800
committerFabio Berger <me@fabioberger.com>2018-08-15 05:39:59 +0800
commit1d9408a8e04aaea35bcf517fd3332b9bcc62bba0 (patch)
treee49c2ee1763134c9d56255a643b25f8aaa3e858d /packages/contract-wrappers
parent2f2582a0da3095d61a99ef09744dc0995677558e (diff)
downloaddexon-0x-contracts-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar
dexon-0x-contracts-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.gz
dexon-0x-contracts-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.bz2
dexon-0x-contracts-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.lz
dexon-0x-contracts-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.xz
dexon-0x-contracts-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.zst
dexon-0x-contracts-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.zip
Fix additional merge conflicts
Diffstat (limited to 'packages/contract-wrappers')
-rw-r--r--packages/contract-wrappers/test/calldata_optimization_utils_test.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contract-wrappers/test/calldata_optimization_utils_test.ts b/packages/contract-wrappers/test/calldata_optimization_utils_test.ts
index a4cea772f..a3abb8503 100644
--- 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';