get rid of merge marks

waldronlab · Oct 31, 2023 · 1ef8318 · 1ef8318
1 parent 6a27ac2
commit 1ef8318
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git 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
@@ -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")