Actually resolve the merge conflict!

grimbough · Jan 24, 2024 · 6d3ddc3 · 6d3ddc3
1 parent 4858ec5
commit 6d3ddc3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,9 +1,5 @@
 Package: biomaRt
-<<<<<<< HEAD
-Version: 2.59.0
-=======
 Version: 2.59.1
->>>>>>> httr2
 Title: Interface to BioMart databases (i.e. Ensembl)
 License: Artistic-2.0
 Description: In recent years a wealth of biological data has become available