From 93edaeafc7d67c09da3b18452283c6d1cf29d02e Mon Sep 17 00:00:00 2001
From: Andreas Brandmaier <andy@brandmaier.de>
Date: Mon, 25 Mar 2024 13:13:02 +0100
Subject: [PATCH] fixed conflict

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

diff --git a/DESCRIPTION b/DESCRIPTION
index 9f9fad1..37cb21d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -50,11 +50,7 @@ License: GPL-3
 Encoding: UTF-8
 LazyLoad: yes
 Version: 0.9.20
-<<<<<<< HEAD
 Date: 2024-03-25
-=======
-Date: 2024-03-14
->>>>>>> c1f3d72a029d525e9e8e407e29b9d0470819b468
 RoxygenNote: 7.2.3
 VignetteBuilder: knitr
 BugReports: https://github.com/brandmaier/semtree/issues