8000 Add a missed merge · matplotlib/matplotlib@32149e4 · GitHub
[go: up one dir, main page]

Skip to content

Commit 32149e4

Browse files
committed
Add a missed merge
1 parent fd9c0b6 commit 32149e4

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

lib/matplotlib/axes.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6075,12 +6075,6 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
60756075
warnings.warn(
60766076
'''replace "faceted=False" with "edgecolors='none'"''',
60776077
mplDeprecation) # 2008/04/18
6078-
<<<<<<< HEAD
6079-
=======
6080-
6081-
sym = None
6082-
symstyle = 0
6083-
>>>>>>> upstream/v1.2.x
60846078

60856079
# to be API compatible
60866080
if marker is None and not (verts is None):

0 commit comments

Comments
 (0)
0