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/market_utils_test.ts | |
| parent | 2f2582a0da3095d61a99ef09744dc0995677558e (diff) | |
| download | dexon-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/order-utils/test/market_utils_test.ts')
| -rw-r--r-- | packages/order-utils/test/market_utils_test.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/order-utils/test/market_utils_test.ts b/packages/order-utils/test/market_utils_test.ts index 21c0a4802..5d94cc55c 100644 --- a/packages/order-utils/test/market_utils_test.ts +++ b/packages/order-utils/test/market_utils_test.ts @@ -2,7 +2,8 @@ import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import 'mocha'; -import { constants, marketUtils } from '../src'; +import { marketUtils } from '../src'; +import { constants } from '../src/constants'; import { chaiSetup } from './utils/chai_setup'; import { testOrderFactory } from './utils/test_order_factory'; |