Resolved conflicts

Yunfei Yang · Yunfei Yang · commit 53a2d2c17849 · 2015-04-12T17:25:55.000-04:00
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1410,8 +1410,8 @@ def axis(*v, **kwargs):
 
       >>> axis('square')
 
-    changes the limits of the (*xmax*-*xmin*) and (*ymax*-*ymin*) of 
-    the *x* and *y* axes to be the same, and have the same scaling, 
+    changes the limits of the (*xmax*-*xmin*) and (*ymax*-*ymin*) of
+    the *x* and *y* axes to be the same, and have the same scaling,
     resulting in a square plot
 
     .. seealso::
