Merge remote-tracking branch 'origin/main' into feature/remove-output

ashbaldry · Jul 23, 2024 · a34cc61 · a34cc61
2 parents 7944302 + 144702b
commit a34cc61
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/inst/examples-shiny/01_boxes/app.R b/inst/examples-shiny/01_boxes/app.R
@@ -1,3 +1,4 @@
+<<<<<<<< HEAD:inst/examples-shiny/01_boxes/app.R
 library(bslib)
 library(shiny)
 library(shiny.destroy)
@@ -57,3 +58,28 @@ server <- function(input, output, session) {
 }
 
 shinyApp(ui, server)
+========
+---
+title: "Example Application"
+output: rmarkdown::html_vignette
+vignette: >
+  %\VignetteIndexEntry{Example Application}
+  %\VignetteEngine{knitr::rmarkdown}
+  %\VignetteEncoding{UTF-8}
+---
+
+```{r, include = FALSE}
+knitr::opts_chunk$set(
+  collapse = TRUE,
+  comment = "#>"
+)
+```
+
+```{r setup}
+
+```
+
+```{r, eval = FALSE}
+
+```
+>>>>>>>> origin/main:vignettes/example.Rmd