Update README.md

remove conflict badge
ABbiodiversity · Oct 18, 2024 · c94cc56 · c94cc56
1 parent 7a065d2
commit c94cc56
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -7,7 +7,6 @@
 [![Codecov test coverage](https://codecov.io/gh/ABbiodiversity/wildRtrax/branch/main/graph/badge.svg)](https://app.codecov.io/gh/ABbiodiversity/wildRtrax?branch=main)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.13916882.svg)](https://doi.org/10.5281/zenodo.13916882)
 [![R-CMD-check](https://github.com/ABbiodiversity/wildRtrax/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ABbiodiversity/wildRtrax/actions/workflows/R-CMD-check.yaml)
->>>>>>> development
 <!-- badges: end -->
 
 ## Overview