SF.net SVN: matplotlib: [5092] trunk/matplotlib/CHANGELOG

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

Revision: 5092
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5092&view=rev
Author:   mdboom
Date:     2008-04-28 09:52:44 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
Removing SVN conflict marker.

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-04-28 14:19:06 UTC (rev 5091)
+++ trunk/matplotlib/CHANGELOG	2008-04-28 16:52:44 UTC (rev 5092)
@@ -14,7 +14,6 @@
 2008-04-24 Fix compilation issues on VS2003 (Thanks Martin Spacek for
            all the help) - MGD
 
->>>>>>> .merge-right.r5090
 2008-04-24 Fix sub/superscripts when the size of the font has been
            changed - MGD
 


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