8000 resolved merge conflict in CHANGELOG · smithsp/matplotlib@da9b536 · GitHub
[go: up one dir, main page]
Skip to content

Commit da9b536

Browse files
HastingsGreerfariza
HastingsGreer
authored and
fariza
committed
resolved merge conflict in CHANGELOG
1 parent 9babee9 commit da9b536

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

‎CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
12
2015-11-16 Levels passed to contour(f) and tricontour(f) must be in increasing
23
order.
34

5+
2015-10-21 Added TextBox widget
6+
7+
48
2015-10-21 Added get_ticks_direction()
59

610
2015-02-27 Added the rcParam 'image.composite_image' to permit users

0 commit comments

Comments
 (0)
0