fix merge conflict?

Author: JosiahParry

tests/testthat/_snaps/cran-compliance.md

@@ -17,13 +17,13 @@
       # A tibble: 9 x 2
         crate          version
         <chr>          <chr>  
-      1 extendr-api    *.*.*  
-      2 extendr-macros *.*.*  
-      3 libR-sys       *.*.*  
-      4 once_cell      *.*.* 
-      5 paste          *.*.* 
-      6 proc-macro2    *.*.* 
-      7 quote          *.*.* 
+      1 extendr-api    *.*.*
+      2 extendr-macros *.*.*
+      3 libR-sys       *.*.*
+      4 once_cell      *.*.*
+      5 paste          *.*.*
+      6 proc-macro2    *.*.*
+      7 quote          *.*.*
       8 syn            *.*.*
-      9 unicode-ident  *.*.* 
+      9 unicode-ident  *.*.*
 

tests/testthat/helper.R

@@ -121,7 +121,7 @@ skip_if_opted_out_of_dev_tests <- function() {
 mask_any_version <- function(snapshot_lines) {
   stringi::stri_replace_all_regex(
     snapshot_lines,
-    "\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?",
+    "\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?\\s*",
     "*.*.*"
   )
 }

tests/testthat/test-cran-compliance.R

@@ -4,6 +4,7 @@ test_that("vendor_pkgs() vendors dependencies", {
   path <- local_package("testpkg")
 
   expect_error(vendor_pkgs(path))
+
   # capture setup messages
   withr::local_options(usethis.quiet = FALSE)
   use_extendr(path, quiet = TRUE)