x

Merge branch 'main' of github.com:Daylily-Informatics/zebra_day
Daylily-Informatics · Oct 30, 2023 · cd926b5 · cd926b5
2 parents e8497b8 + ec014b1
commit cd926b5
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,6 @@
 <img src=zebra_day/imgs/bar_red.png>
 
-<<<<<<< HEAD
 ## zebra_day Overview [v0.2.1](https://github.com/Daylily-Informatics/zebra_day/releases/tag/v0.2.1)
-=======
-
-## zebra_day Overview [v0.2.0](https://github.com/Daylily-Informatics/zebra_day/releases/tag/v0.2.0)
->>>>>>> 42e82b79b98533685109b2a5f4bf84a4f7663cfe
-
 
 <ul>