From 7f1b9ea4c6f9f5ac1c0bff2d4d73aa0dd2387759 Mon Sep 17 00:00:00 2001
From: Juan Nunez-Iglesias <jni@janelia.hhmi.org>
Date: Tue, 2 Jul 2013 19:42:24 +0200
Subject: [PATCH] Fix automerge bug

---
 skimage/util/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skimage/util/__init__.py b/skimage/util/__init__.py
index 474b2966..b196af34 100644
--- a/skimage/util/__init__.py
+++ b/skimage/util/__init__.py
@@ -23,5 +23,5 @@ __all__ = ['img_as_float',
            'view_as_blocks',
            'view_as_windows',
            'pad',
-           'random_noise']
+           'random_noise',
            'regular_grid']