From 96103a8db711faf82d6e96f46f2356bd2f53a269 Mon Sep 17 00:00:00 2001
From: James Wade <jhwade@dow.com>
Date: Mon, 26 Aug 2024 20:35:07 -0400
Subject: [PATCH] more packages to suggests

---
 DESCRIPTION | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 1e00f944..88358dac 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -34,11 +34,7 @@ Imports:
     jsonlite,
     magrittr,
     purrr,
-<<<<<<< HEAD
-    R6 (>=2.0.0),
-=======
-    R6 (>=2.0),
->>>>>>> 37ff8643 (more packages to suggests)
+    R6 (>= 2.0),
     rlang,
     rstudioapi (>= 0.12),
     shiny (>= 1.9.0),