expose EventAperture class

OHDSI · Sep 7, 2023 · 5294f7c · 5294f7c
1 parent 086242e
commit 5294f7c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -53,6 +53,7 @@ Collate:
     'Capr.R'
     'conceptSet.R'
     'attributes-concept.R'
+    'attributes-dateAdjustment.R'
     'attributes-logic.R'
     'query.R'
     'window.R'

diff --git a/R/window.R b/R/window.R
@@ -92,7 +92,6 @@ continuousObservation <- function(priorDays = 0L, postDays = 0L) {
 
 }
 
-<<<<<<< HEAD
 #Depreciated Endpoint functions
 # #' A function to offset the number of days relative to index
 # #' @param days a number specifying the number of days to offset from index where
@@ -122,8 +121,6 @@ continuousObservation <- function(priorDays = 0L, postDays = 0L) {
 #       coeff = "after")
 # }
 
-=======
->>>>>>> 31a4286d79c78e2385a137ff974113247f06b699
 
 ## EventWindow ---------------------
 

diff --git a/man/EventAperture-class.Rd b/man/EventAperture-class.Rd