Skip to content

Commit

Permalink
Merge branch 'main' into f1032-remove-blank-lines-after-and-before-pa…
Browse files Browse the repository at this point in the history
…rens
  • Loading branch information
IndrajeetPatil authored May 11, 2024
2 parents 0d67987 + 0f9625a commit 1f60831
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion R/roxygen-examples-parse.R
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,6 @@ needs_rd_emulation <- function(roxygen) {
#' @keywords internal
post_parse_roxygen <- function(raw) {
raw %>%
paste0(collapse = "") %>%
paste(collapse = "") %>%
convert_newlines_to_linebreaks()
}
2 changes: 1 addition & 1 deletion R/utils-cache.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ hash_standardize <- function(text) {
text %>%
convert_newlines_to_linebreaks() %>%
enc2utf8() %>%
paste0(collapse = "\n") %>%
paste(collapse = "\n") %>%
list()
}

Expand Down
5 changes: 2 additions & 3 deletions touchstone/config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"os": "ubuntu-latest",
"r": "4.2",
"rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2023-03-01",
"r": "4.4",
"rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2024-05-01",
"benchmarking_repo": "lorenzwalthert/here",
"benchmarking_ref": "bf0167746da7fe4fb156082bad93c9e5cd3386bd",
"benchmarking_path": "touchstone/sources/here",

}

0 comments on commit 1f60831

Please sign in to comment.