Fix diff markers

mdboom · mdboom · commit ce9377f9366d · 2013-08-26T15:44:20.000-04:00
diff --git a/lib/matplotlib/backends/qt4_editor/formlayout.py b/lib/matplotlib/backends/qt4_editor/formlayout.py
@@ -79,42 +79,21 @@ def choose_color(self):
     def get_color(self):
         return self._color
 
-<<<<<<< HEAD
     @QtCore.Slot("QColor")
-=======
-<<<<<<< HEAD
-    @pyqtSignature("QColor")
-=======
-    @QtCore.Slot("QColor")
->>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
->>>>>>> upstream/v1.3.x
     def set_color(self, color):
         if color != self._color:
             self._color = color
             self.emit(QtCore.SIGNAL("colorChanged(QColor)"), self._color)
             pixmap = QtGui.QPixmap(self.iconSize())
             pixmap.fill(color)
-<<<<<<< HEAD
-            self.setIcon(QtGui.QIcon(pixmap))
-=======
-<<<<<<< HEAD
-            self.setIcon(QIcon(pixmap))
-=======
             self.setIcon(QtGui.QIcon(pixmap))
 
     color = QtCore.Property("QColor", get_color, set_color)
->>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
->>>>>>> upstream/v1.3.x
 
-    color = QtCore.Property("QColor", get_color, set_color)
-
-<<<<<<< HEAD
 def col2hex(color):
     """Convert matplotlib color to hex before passing to Qt"""
     return rgb2hex(colorConverter.to_rgb(color))
-=======
-<<<<<<< HEAD
-=======
+
 def to_qcolor(color):
     """Create a QColor from a matplotlib color"""
     qcolor = QtGui.QColor()
@@ -126,8 +105,6 @@ def to_qcolor(color):
         return qcolor # return invalid QColor
     qcolor.setNamedColor(color) # set using hex color
     return qcolor # return valid QColor
->>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
->>>>>>> upstream/v1.3.x
 
 def to_qcolor(color):
     """Create a QColor from a matplotlib color"""
