missed a conflict

pharmaverse · Oct 6, 2023 · 6bb3e37 · 6bb3e37
1 parent 1850984
commit 6bb3e37
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,11 +1,7 @@
 Package: admiral
 Type: Package
 Title: ADaM in R Asset Library
-<<<<<<< HEAD
-Version: 0.12.1.9000
-=======
 Version: 0.12.2.9000
->>>>>>> main
 Authors@R: c(
     person("Ben", "Straub", email = "ben.x.straub@gsk.com", role = c("aut", "cre")),
     person("Stefan", "Bundfuss", role = "aut"),