From 09e6439310c2fcc88ef065ed796cd4415ac4274c Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Sun, 12 Oct 2014 19:19:54 -0500
Subject: [PATCH] Update multi_image test and install tifffile for travis.

---
 skimage/io/collection.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/skimage/io/collection.py b/skimage/io/collection.py
index ab445214..9d12ef01 100644
--- a/skimage/io/collection.py
+++ b/skimage/io/collection.py
@@ -115,7 +115,7 @@ class MultiImage(object):
         self._dtype = dtype
         self._cached = None
 
-        
+
         if filename.lower().endswith(('.tiff', '.tif')):
             self.tif_img = img = TiffFile(self._filename)
 
@@ -139,11 +139,8 @@ class MultiImage(object):
 
     def _find_numframes(self, img):
         """Find the number of frames in the multi-img."""
-<<<<<<< HEAD
+        
         if self.tif_img:
-=======
-        if self._tif_img:
->>>>>>> 70b6909... Add tifffile support for MultiImage
             return len(img.pages)
         i = 0
         while True: