pull Adam change on window

Merge branch 'develop' of https://github.com/OHDSI/Capr into develop # Conflicts: # R/window.R
OHDSI · Sep 6, 2023 · 2ac6544 · 2ac6544
2 parents 0b9160c + 31a4286
commit 2ac6544
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 2.1.0
-Date: 2023-08-14 16:10:03 UTC
-SHA: 7ae41403a936fe50e2cb12052df4a3b99e6022b1
+Version: 2.0.6
+Date: 2023-09-06 18:37:34 UTC
+SHA: 71f1dd8bb419ec22cb023ee8502417a1bb82ccef
diff --git a/R/window.R b/R/window.R
@@ -92,6 +92,7 @@ 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
@@ -121,6 +122,8 @@ continuousObservation <- function(priorDays = 0L, postDays = 0L) {
 #       coeff = "after")
 # }
 
+=======
+>>>>>>> 31a4286d79c78e2385a137ff974113247f06b699
 
 ## EventWindow ---------------------