fixed merge conflict and docs

CHANGELOG.md

@@ -1,7 +1,7 @@
-<<<<<<< HEAD
 ## [1.1.2] - 2015-10-09
 ### ADDED
 - `Image` objects now have a `frame_number` attribute.
+- `Nd2` can be used as a context manager.
 
 ### CHANGED
 - `Image` objects now directly subclass Numpy arrays.
@@ -11,8 +11,6 @@
 - The `data` attribute is no longer needed since `Image` is now a Numpy array.
 - The `image_sets` iterator will be removed in the near future. You should implement this yourself.
 
-=======
->>>>>>> origin/master
 ## [1.1.1] - 2015-09-02
 ### FIXED
 - Images returned by indexing would sometimes be skipped when the file contained multiple channels

nd2reader/interface.py

@@ -50,15 +50,6 @@ class Nd2(object):
         """
         Allows slicing ND2s.
 
-        >>> nd2 = Nd2("my_images.nd2")
-        >>> image = nd2[16]  # gets 17th frame
-        >>> for image in nd2[100:200]:  # iterate over the 100th to 200th images
-        >>>     do_something(image)
-        >>> for image in nd2[::-1]:  # iterate backwards
-        >>>     do_something(image)
-        >>> for image in nd2[37:422:17]:  # do something super weird if you really want to
-        >>>     do_something(image)
-
         :type item: int or slice
         :rtype: nd2reader.model.Image() or generator