From 9a568c34e9acc10009509d4e13bfe09ae1870410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=CC=8Ans=20Magnusson?= <mons.magnusson@gmail.com>
Date: Tue, 15 Mar 2022 10:03:18 +0100
Subject: [PATCH] Fix

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

diff --git a/DESCRIPTION b/DESCRIPTION
index abcd5d2..aaf72d0 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -27,8 +27,5 @@ Suggests:
     knitr
 LazyData: true
 RoxygenNote: 7.1.1
-<<<<<<< HEAD
-=======
 X-schema.org-isPartOf: http://ropengov.org/
 X-schema.org-keywords: ropengov
->>>>>>> 04a2d002ad02bab0f57980a4d7585a5d8378e574