wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-19 11:27:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix lingering merge issue

Browse Source
This commit is contained in:
Steven Silvester
2014-12-27 11:11:36 -06:00
parent 67fadc0ed8
commit 51ab675d3c
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/viewer/tests/test_plugins.py
-8
View File
@@ -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'):