From 64bba9ec3c76025886ac1ff06b3b017a9a5cc10c Mon Sep 17 00:00:00 2001
From: guifabre <guijoseph.fabre@gmail.com>
Date: Sun, 1 Oct 2023 06:40:18 -0400
Subject: [PATCH] resolve conflict

---
 vignettes/fabR-vignette.Rmd | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/vignettes/fabR-vignette.Rmd b/vignettes/fabR-vignette.Rmd
index 2374503..2d5b154 100644
--- a/vignettes/fabR-vignette.Rmd
+++ b/vignettes/fabR-vignette.Rmd
@@ -10,10 +10,15 @@ vignette: >
 ```{r, include = FALSE}
 knitr::opts_chunk$set(
   collapse = TRUE,
-  comment = "#>"
-)
+  eval = FALSE,
+  comment = "#>",
+  warning = FALSE,
+  message = FALSE,
+  echo = TRUE)
+
 ```
 
+
 # fabR
 
 <!-- badges: start -->
@@ -30,19 +35,15 @@ assessment and visualization of data frame-like material.
 You can install the package from CRAN, or the development version of fabR from
 [GitHub](https://github.com/):
 
-
 ``` {r setup}
-install.packages("fabR",repos = "https://cloud.r-project.org/")
+# To update the R package in your R environment you may first need to remove 
+# it, and use the exit command quit() to terminate the current R session.
 
-# install.package("devtools")
-# devtools::install_github(repo = "https://github.com/guifabre/fabR", 
-#  auth_token = "ghp_xxx",force = TRUE)
+# To install the R package:
+install.packages('fabR')
+library(fabR) 
 
-```
-
-## Example
-
-```{r}
-library(fabR)
+#if you need help with the package, please use:
 fabR_help()
+
 ```