From 014b4905784f50fd13111ca8528fade9be4bd767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Mon, 20 Aug 2012 22:50:35 +0200 Subject: [PATCH] Fix import bug due to rebase --- skimage/feature/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/skimage/feature/__init__.py b/skimage/feature/__init__.py index 4acb678e..1597e9a8 100644 --- a/skimage/feature/__init__.py +++ b/skimage/feature/__init__.py @@ -1,6 +1,4 @@ from ._hog import hog -from ._greycomatrix import greycomatrix, greycoprops -from .hog import hog from .texture import greycomatrix, greycoprops, local_binary_pattern from .peak import peak_local_max from ._harris import harris