From 51ab675d3c6fd67c1f10d218ddc7d9bf04572cb0 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Sat, 27 Dec 2014 11:11:36 -0600
Subject: [PATCH] Fix lingering merge issue

---
 skimage/viewer/tests/test_plugins.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/skimage/viewer/tests/test_plugins.py b/skimage/viewer/tests/test_plugins.py
index 699578f2..8dcf7855 100644
--- a/skimage/viewer/tests/test_plugins.py
+++ b/skimage/viewer/tests/test_plugins.py
@@ -12,15 +12,7 @@ from skimage.viewer.plugins import (
     PlotPlugin)
 from numpy.testing import assert_equal, assert_allclose, assert_almost_equal
 from numpy.testing.decorators import skipif
-<<<<<<< HEAD
-from skimage.viewer.plugins import (
-    LineProfile, Measure, CannyPlugin, LabelPainter, Crop, ColorHistogram,
-    PlotPlugin)
-from skimage.viewer.plugins.base import Plugin
-from skimage.viewer.widgets import Slider
 from skimage._shared._warnings import expected_warnings
-=======
->>>>>>> 7e2fdf7... Update viewer for PyQt5 compatibility
 
 
 def setup_line_profile(image, limits='image'):