Merge branch 'master' into age-fcase

MichaelChirico · Dec 22, 2024 · 78bce85 · 78bce85
2 parents cfdd0c1 + afd13d3
commit 78bce85
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -126,8 +126,12 @@ test_that('get_age works', {
       47.0,
       47.0 + 1.0/366.0,
 
+<<<<<<< HEAD
       7.0 + 1.0/366.0, # 366 days until 2032-12-22
       NA_real_,
+=======
+      7.0 + 1.0/366.0, # 366 days until 2032-12-22, not 367 (#23)
+>>>>>>> master
       NULL
     )
   )