From 3feec7a2e238555d33eccaf9b892b2529b667448 Mon Sep 17 00:00:00 2001
From: Greg Frasco <frascog17@gmail.com>
Date: Tue, 12 Nov 2024 15:34:59 -0500
Subject: [PATCH] fix: add conflict package

---
 comets_shinyapp_example/app.R     | 1 +
 comets_shinyapp_example/renv.lock | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/comets_shinyapp_example/app.R b/comets_shinyapp_example/app.R
index d3d98d9..d8cb3b6 100644
--- a/comets_shinyapp_example/app.R
+++ b/comets_shinyapp_example/app.R
@@ -4,6 +4,7 @@ library(DT)
 library(data.table)
 library(ggplot2)
 library(tidyverse)
+library(conflicted)
 
 # Use conflicted to set preferences for conflicting functions
 conflict_prefer("between", "data.table")
diff --git a/comets_shinyapp_example/renv.lock b/comets_shinyapp_example/renv.lock
index 8d0abe9..1bff62e 100644
--- a/comets_shinyapp_example/renv.lock
+++ b/comets_shinyapp_example/renv.lock
@@ -56,6 +56,12 @@
         "Version": "0.3.2",
         "Source": "Repository",
         "Repository": "CRAN"
+    },
+    "conflict": {
+        "Package": "conflict",
+        "Version": "0.1.2",
+        "Source": "Repository",
+        "Repository": "CRAN"
     }
   }
 }
\ No newline at end of file