From 192d8bfecdf53281bb91e756fa6fe25679e6c352 Mon Sep 17 00:00:00 2001
From: Sima Najafzadehkhoei <u1418987@umail.utah.edu>
Date: Tue, 10 Dec 2024 16:41:27 -0700
Subject: [PATCH] resolving errors

---
 .Rbuildignore | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.Rbuildignore b/.Rbuildignore
index 10e810a..042b000 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -2,10 +2,8 @@
 ^\.Rproj\.user$
 ^LICENSE\.md$
 ^\.github$
-<<<<<<< HEAD
 ^misc$
-=======
-^misc$
->>>>>>> b1fce5ac678b1f125c0aa460a8145c4686616376
+b1fce5ac678b1f125c0aa460a8145c4686616376
 README.Rmd
 ^.*\\.Rproj$
+^epiworldRcalibrate\.Rproj$