From bdd5336d57c41c8699a287bd7259735d3d6cf0c0 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Wed, 21 Dec 2016 11:11:25 +0100
Subject: [PATCH] Remove unused imports

---
 nbdime-web/src/merge/manualedit.ts           | 7 +++----
 nbdime-web/test/src/merge/manualedit.spec.ts | 6 +-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/nbdime-web/src/merge/manualedit.ts b/nbdime-web/src/merge/manualedit.ts
index b39c325f..c420f37e 100644
--- a/nbdime-web/src/merge/manualedit.ts
+++ b/nbdime-web/src/merge/manualedit.ts
@@ -7,8 +7,8 @@ import {
 } from '@jupyterlab/services';
 
 import {
-  MergeDecision, buildDiffs, addSorted, pushPatchDecision,
-  pushPatchDecisionInPlace, splitDiffStringPath
+  MergeDecision, buildDiffs, addSorted, pushPatchDecisionInPlace,
+  splitDiffStringPath
 } from './decisions';
 
 import {
@@ -38,8 +38,7 @@ import {
 } from '../patch';
 
 import {
-  hasEntries, arraysEqual, extendArray, splitLines,
-  isPrefixArray, removeElement
+  hasEntries, arraysEqual, splitLines, removeElement
 } from '../common/util';
 
 import {
diff --git a/nbdime-web/test/src/merge/manualedit.spec.ts b/nbdime-web/test/src/merge/manualedit.spec.ts
index 3e2e2098..071a1e2c 100644
--- a/nbdime-web/test/src/merge/manualedit.spec.ts
+++ b/nbdime-web/test/src/merge/manualedit.spec.ts
@@ -18,13 +18,9 @@ import {
 
 import {
   opPatch, opAddRange, opRemoveRange, IDiffAddRange,
-  IDiffRemoveRange, IDiffPatchArray
+  IDiffPatchArray
 } from '../../../src/diff/diffentries';
 
-import {
-  createPatchStringDiffModel, IStringDiffModel
-} from '../../../src/diff/model';
-
 import {
   IMergeDecision
 } from '../../../src/merge/decisions';