From 3d2ee3982a6f123b542859b48ddcc4eff283f377 Mon Sep 17 00:00:00 2001
From: Juliette Engelaere-Lefebvre
 <juliette.engelaere@developpement-durable.gouv.fr>
Date: Wed, 19 Jul 2023 14:52:51 +0200
Subject: [PATCH] fix conflict unresolved

---
 dev/tools/deploy.R | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev/tools/deploy.R b/dev/tools/deploy.R
index 08d005cf..cbdbba3b 100644
--- a/dev/tools/deploy.R
+++ b/dev/tools/deploy.R
@@ -8,7 +8,6 @@ remotes::install_deps()
 remotes::install_local()
 
 
-
 message("--- Add server ---\n")
 
 rsconnect::setAccountInfo(
@@ -20,11 +19,8 @@ rsconnect::setAccountInfo(
 message("--- Deploying app ---\n")
 appFiles <- list.files(".", recursive = TRUE)
 appFiles <- appFiles[!grepl(".Rprofile|renv|rstudio_|dev|data-raw|docker|testthat|test.convert.dsfr", appFiles)]
-<<<<<<< HEAD
-=======
 
 options(rsconnect.packrat = TRUE)
->>>>>>> a1f0ed2 (- Test restauration deploiement CI : ajout option rsconnect options(rsconnect.packrat = TRUE) pour restaurer son comportement précédent depuis le passage à la v1.0.0)
 
 rsconnect::deployApp(
   appDir = ".",