From 2d7cebbe5f2488b3febfc02ee5c07e84ce860da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jsch@demuc.de>
Date: Thu, 22 Jan 2015 06:23:22 -0500
Subject: [PATCH] Resolve incorrect rebase

---
 skimage/data/__init__.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py
index 8cd7151c..2be829ac 100644
--- a/skimage/data/__init__.py
+++ b/skimage/data/__init__.py
@@ -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',