From 55ddf62df2ec8dfc3d2146f31356df67603fb259 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 23 Nov 2017 13:47:42 -0600
Subject: Fix rebasing issues

---
 packages/0x.js/test/remaining_fillable_calculator_test.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'packages/0x.js/test/remaining_fillable_calculator_test.ts')

diff --git a/packages/0x.js/test/remaining_fillable_calculator_test.ts b/packages/0x.js/test/remaining_fillable_calculator_test.ts
index 65b65efd8..610bf9b1a 100644
--- a/packages/0x.js/test/remaining_fillable_calculator_test.ts
+++ b/packages/0x.js/test/remaining_fillable_calculator_test.ts
@@ -1,11 +1,13 @@
-import 'mocha';
-import * as chai from 'chai';
 import BigNumber from 'bignumber.js';
-import { chaiSetup } from './utils/chai_setup';
+import * as chai from 'chai';
+import 'mocha';
+
+import { ZeroEx } from '../src/0x';
 import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fillable_calculator';
-import { SignedOrder, ECSignature } from '../src/types';
+import { ECSignature, SignedOrder } from '../src/types';
+
+import { chaiSetup } from './utils/chai_setup';
 import { TokenUtils } from './utils/token_utils';
-import { ZeroEx } from '../src/0x';
 
 chaiSetup.configure();
 const expect = chai.expect;
-- 
cgit v1.2.3