From 8d4f49c63fa8eb2faeb8b3c67d9f1f3cde3827c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Mu=CC=88ller?= <fmueller@mpi-inf.mpg.de>
Date: Mon, 17 Jan 2022 15:03:51 +0100
Subject: [PATCH] ...

---
 DESCRIPTION | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index d35e04e..086a1fe 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -13,13 +13,8 @@ Authors@R: c(
     role = c("aut")),
     person("Fabian", "Mueller", email = "team@rnbeads.org",
     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,