Commit 57d3173
committed
Merge remote-tracking branch 'matplotlib/v2.x'
Conflicts:
lib/matplotlib/collections.py
import conflicts
lib/matplotlib/lines.py
import conflicts
lib/matplotlib/tests/test_coding_standards.py
adjacent lines were removed
lib/matplotlib/tests/test_font_manager.py
multiple tests were added
setupext.py
comments14 files changed
Lines changed: 298 additions & 1184 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
0 commit comments