Add a missed merge

Author: mdboom

lib/matplotlib/axes.py

@@ -6075,12 +6075,6 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
             warnings.warn(
                 '''replace "faceted=False" with "edgecolors='none'"''',
                 mplDeprecation)  # 2008/04/18
-<<<<<<< HEAD
-=======
-
-        sym = None
-        symstyle = 0
->>>>>>> upstream/v1.2.x
 
         # to be API compatible
         if marker is None and not (verts is None):