Revision: 7877
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7877&view=rev
Author: mdboom
Date: 2009-10-12 13:43:48 +0000 (Mon, 12 Oct 2009)
Log Message:
-----------
Remove conflict markers accidentally committed in last commit.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py 2009-10-12
13:39:14 UTC (rev 7876)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py 2009-10-12
13:43:48 UTC (rev 7877)
@@ -1344,13 +1344,9 @@
def draw_path(self, gc, path, transform, rgbFace=None):
self.check_gc(gc, rgbFace)
-<<<<<<< .working
- self.file.writePath(path, transform, (rgbFace is None and
gc.get_hatch_path() is None))
-=======
self.file.writePath(
path, transform,
rgbFace is None and gc.get_hatch_path() is None)
->>>>>>> .merge-right.r7874
self.file.output(self.gc.paint())
def draw_markers(self, gc, marker_path, marker_trans, path, trans,
rgbFace=None):
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
