resolve conflicts in DESCRIPTION

Merck · Jun 12, 2024 · 978d5f7 · 978d5f7
1 parent c24118c
commit 978d5f7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,10 +1,6 @@
 Package: gsDesign2
 Title: Group Sequential Design with Non-Constant Effect
-<<<<<<< 419-add-developer-test-for-gs_power_ahr
 Version: 1.1.2.11
-=======
-Version: 1.1.2.10
->>>>>>> main
 Authors@R: c(
     person("Keaven", "Anderson", email = "[email protected]", role = c("aut")),
     person("Yilong", "Zhang", email = "[email protected]", role = c("aut")),