8000 merge not sticking? · matplotlib/matplotlib@2cb05a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2cb05a1

Browse files
story645story645
committed
merge not sticking?
1 parent 0cccf26 commit 2cb05a1

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

‎README.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,7 @@
2525
.. |NUMFocus| image:: https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A
2626
.. _NUMFocus: https://www.numfocus.org
2727

28-
<<<<<<< HEAD
29-
30-
.. |GitTutorial| image:: https://img.shields.io/badge/PR-Welcome-%23FF8300.svg?
31-
.. _GitTutorial: https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
32-
33-
.. image:: doc/_static/logo2.png
34-
=======
3528
.. image:: https://matplotlib.org/_static/logo2.svg
36-
>>>>>>> a3e4d0f1b... Merge pull request #16671 from QuLogic/readme-fixes
3729

3830

3931
Matplotlib is a comprehensive library for creating static, animated, and interactive visualizations in Python.

0 commit comments

Comments
 (0)
0