Merge branch 'main' into 10-as-dev-i-would-like-to-have-a-questionnai…

…re-class
unhcr-americas · Apr 26, 2023 · 7847107 · 7847107
2 parents 43d912b + b7a97ef
commit 7847107
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -10,8 +10,5 @@ $run_dev.*
 ^\.github$
 ^surveyDesigner\.Rproj$
 ^docs$
-<<<<<<< HEAD
 ^app\.R$
-=======
->>>>>>> 5d46f08550c1eb5c6e5e288d470fff79faa8a585
 ^rsconnect$