From dd884f5765fea1a9bfb24540dd5075ea21a0434a Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 10 Sep 2024 23:53:10 +0200
Subject: [PATCH] Fix description file

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

diff --git a/DESCRIPTION b/DESCRIPTION
index 9be70b1..2531f06 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -13,11 +13,7 @@ License: MIT + file LICENSE
 BugReports: https://github.com/ropensci/skynet/issues
 Encoding: UTF-8
 LazyData: true
-<<<<<<< HEAD
-RoxygenNote: 7.2.0
-=======
 RoxygenNote: 7.3.2
->>>>>>> b667d23454f08e9e99a4f93251470f6a88f71c43
 Collate:
     'PowerLaw.R'
     'createNodes.R'