...

epigen · Jan 17, 2022 · 8d4f49c · 8d4f49c
1 parent c75db23
commit 8d4f49c
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,13 +13,8 @@ Authors@R: c(
     role = c("aut")),
     person("Fabian", "Mueller", email = "[email protected]",
     role = c("aut", "cre")))
-<<<<<<< HEAD
 Date: 2022-01-17
 Version: 2.13.3
-=======
-Date: 2021-11-05
-Version: 2.12.2
->>>>>>> 472e99f8d43c8f8b8379017b68464f8bc2c6430e
 Suggests:
     Category,
     GOstats,
@@ -74,11 +69,7 @@ Depends:
     fields,
     ggplot2 (>= 0.9.2),
     gplots,
-<<<<<<< HEAD
     grid,
-=======
-	    grid,
->>>>>>> 472e99f8d43c8f8b8379017b68464f8bc2c6430e
     gridExtra,
     limma,
     matrixStats,