Remove conflict markers from last commit.

svn path=/trunk/matplotlib/; revision=7923

Author: mdboom

lib/matplotlib/collections.py

@@ -574,7 +574,6 @@ def set_verts(self, verts, closed=True):
         if closed:
             self._paths = []
             for xy in verts:
-<<<<<<< .working
                 if len(xy):
                     if np.ma.isMaskedArray(xy):
                         xy = np.ma.concatenate([xy, np.zeros((1,2))])
@@ -586,19 +585,6 @@ def set_verts(self, verts, closed=True):
                     codes[0] = mpath.Path.MOVETO
                     codes[-1] = mpath.Path.CLOSEPOLY
                     self._paths.append(mpath.Path(xy, codes))
-=======
-                if len(xy):
-                    if np.ma.isMaskedArray(xy):
-                        xy = np.ma.concatenate([xy, np.zeros((1,2))])
-                    else:
-                        xy = np.asarray(xy)
-                        xy = np.concatenate([xy, np.zeros((1,2))])
-                    codes = np.empty(xy.shape[0], dtype='uint8')
-                    codes[:] = mpath.Path.LINETO
-                    codes[0] = mpath.Path.MOVETO
-                    codes[-1] = mpath.Path.CLOSEPOLY
-                    self._paths.append(mpath.Path(xy, codes))
->>>>>>> .merge-right.r7919
                 else:
                     self._paths.append(mpath.Path(xy))
         else:

src/_backend_agg.cpp

@@ -163,17 +163,6 @@ GCAgg::GCAgg(const Py::Object &gc, double dpi) :
   _set_hatch_path(gc);
 }
 
-<<<<<<< .working
-=======
-GCAgg::GCAgg(double dpi) :
-  dpi(dpi), isaa(true),
-  cap(agg::butt_cap), join(agg::round_join), linewidth(1.0), alpha(1.0),
-  dashOffset(0.0)
-{
-
-}
-
->>>>>>> .merge-right.r7919
 void
 GCAgg::_set_antialiased(const Py::Object& gc) {
   _VERBOSE("GCAgg::antialiased");