diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-08-15 05:39:59 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-08-15 05:39:59 +0800 |
| commit | 1d9408a8e04aaea35bcf517fd3332b9bcc62bba0 (patch) | |
| tree | e49c2ee1763134c9d56255a643b25f8aaa3e858d /packages/order-utils/test/utils | |
| parent | 2f2582a0da3095d61a99ef09744dc0995677558e (diff) | |
| download | dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.gz dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.bz2 dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.lz dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.xz dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.zst dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.zip | |
Fix additional merge conflicts
Diffstat (limited to 'packages/order-utils/test/utils')
| -rw-r--r-- | packages/order-utils/test/utils/test_order_factory.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/order-utils/test/utils/test_order_factory.ts b/packages/order-utils/test/utils/test_order_factory.ts index 75dc6f1f2..69184f129 100644 --- a/packages/order-utils/test/utils/test_order_factory.ts +++ b/packages/order-utils/test/utils/test_order_factory.ts @@ -1,7 +1,8 @@ import { Order, SignedOrder } from '@0xproject/types'; import * as _ from 'lodash'; -import { constants, orderFactory } from '../../src'; +import { constants } from '../../src/constants'; +import { orderFactory } from '../../src/order_factory'; const BASE_TEST_ORDER: Order = orderFactory.createOrder( constants.NULL_ADDRESS, |