From 1ef83184773948a02a5f5da214229e281f174f8c Mon Sep 17 00:00:00 2001
From: lwaldron <lwaldron.research@gmail.com>
Date: Tue, 31 Oct 2023 17:12:58 -0400
Subject: [PATCH] get rid of merge marks

---
 .Rbuildignore                      | 4 ----
 inst/unitTests/test_checkCurated.R | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/.Rbuildignore b/.Rbuildignore
index db201e2..869a875 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,12 +1,8 @@
 ^README\.md$
 ^external_data_store\.txt$
 ^\.gitattributes$
-<<<<<<< HEAD
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^.github$
-=======
 .github
 curatedOvarianData.Rproj
-
->>>>>>> c16d804 (get rid of affy deps)
diff --git a/inst/unitTests/test_checkCurated.R b/inst/unitTests/test_checkCurated.R
index cb449a1..a60402f 100644
--- a/inst/unitTests/test_checkCurated.R
+++ b/inst/unitTests/test_checkCurated.R
@@ -1,8 +1,5 @@
 test_checkCurated <- function(){
-<<<<<<< HEAD
-=======
     library(curatedOvarianData)
->>>>>>> c16d804 (get rid of affy deps)
     ##the template to use
     ##template.file <- "../extdata/template_ov.csv"
     template.file <- system.file("extdata/template_ov.csv", package = "curatedOvarianData")