scikit-learn
diff --git a/‎doc/developers/contributing.rst
Copy file name to clipboardExpand all lines: doc/developers/contributing.rst
-7Lines changed: 0 additions & 7 deletions b/‎doc/developers/contributing.rst
Copy file name to clipboardExpand all lines: doc/developers/contributing.rst
-7Lines changed: 0 additions & 7 deletions
@@ -67,19 +67,12 @@ link to it from your website, or simply star to say "I use it":
 
 .. raw:: html
 
-<<<<<<< HEAD
   <p>
     <object
       data="https://img.shields.io/github/stars/scikit-learn/scikit-learn?style=for-the-badge&logo=github"
       type="image/svg+xml">
     </object>
   </p>
-=======
-  <a class="github-button" href="https://github.com/scikit-learn/scikit-learn"
-  data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star
-  scikit-learn/scikit-learn on GitHub">Star</a>
-  <script async defer src="https://buttons.github.io/buttons.js"></script>
->>>>>>> 34db65a3ad (DOC use pydata-sphinx-theme for the website (#29038))
 
 In case a contribution/issue involves changes to the API principles
 or changes to dependencies or supported versions, it must be backed by a