update via merge

laderast · Jun 21, 2024 · 9a790f6 · 9a790f6
1 parent b3c1d99
commit 9a790f6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/reactives/app-bindEvent.R b/reactives/app-bindEvent.R
@@ -1,17 +1,11 @@
 library(palmerpenguins)
 choices <- unique(penguins$species)
 library(reactlog)
-<<<<<<< HEAD
-library(shiny)
-library(bslib)
-=======
 library(ggplot2)
 library(shiny)
 library(bslib)
 library(dplyr)
 
->>>>>>> 3454c46a358523be36c44f7f6b4b2a3b55fad3fd
-
 reactlog_enable()
 
 ui <- page_sidebar(

diff --git a/reactives/app_eventReactive.R b/reactives/app_eventReactive.R
@@ -2,13 +2,8 @@ library(palmerpenguins)
 library(reactlog)
 library(ggplot2)
 library(shiny)
-<<<<<<< HEAD
-library(dplyr)
-library(bslib)
-=======
 library(bslib)
 library(dplyr)
->>>>>>> 3454c46a358523be36c44f7f6b4b2a3b55fad3fd
 
 reactlog_enable()
 choices <- unique(penguins$species)