remove merge conflict for cohort

OHDSI · Sep 6, 2023 · 4676563 · 4676563
1 parent 6fc04f3
commit 4676563
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/R/cohort.R b/R/cohort.R
@@ -411,7 +411,6 @@ generateCaprTemplate <- function(file, .capr) {
   .capr(conceptSet)
 }
 
-<<<<<<< HEAD
 # writeCohort <- function(x, path, ...) {
 #   checkmate::assertClass(x, "Cohort")
 #   checkmate::assertCharacter(path, len = 1, min.chars = 1, pattern = "\\.json$")
@@ -478,11 +477,3 @@ makeCohortSet <- function(...) {
 
 }
 
-
-
-
-
-
-
-=======
->>>>>>> 84dfd727b8ad3f113d9799bd759456750bbd5ec5