SF.net SVN: matplotlib: [5004] trunk/matplotlib/lib/matplotlib/axes.py

[<md...@us...>]

Revision: 5004
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5004&view=rev
Author:   mdboom
Date:     2008-03-18 11:46:07 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Fixing merge error.  (Thanks Manuel Metz)

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008-03-18 18:35:10 UTC (rev 5003)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008-03-18 18:46:07 UTC (rev 5004)
@@ -4188,7 +4188,6 @@
 
         Finally, marker can be (verts, 0), verts is a sequence of (x,y)
         vertices for a custom scatter symbol.
-<<<<<<< .working
 
             numsides is the number of sides
 
@@ -4202,9 +4201,6 @@
         Finally, marker can be (verts, 0), verts is a sequence of (x,y)
         vertices for a custom scatter symbol.
 
-=======
-
->>>>>>> .merge-right.r4987
         s is a size argument in points squared.
 
         Any or all of x, y, s, and c may be masked arrays, in which


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.