more packages to suggests

MichelNivard · Aug 27, 2024 · 96103a8 · 96103a8
1 parent 4e089e6
commit 96103a8
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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),