wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-01 14:54:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve incorrect rebase

Browse Source
This commit is contained in:
Johannes Schönberger
2015-01-22 06:23:22 -05:00
parent ee5c6fbeb2
commit 2d7cebbe5f
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/data/__init__.py
+1 -6
View File
@@ -8,13 +8,8 @@ For more images, see
import os as _os
<<<<<<< HEAD
from ..io import imread, use_plugin
from skimage import data_dir
=======
from .. import data_dir
from ..io import imread
>>>>>>> Use relative imports in skimage files
from ..io import imread, use_plugin
__all__ = ['load',