Skip to content

Commit

Permalink
Merge branch 'main' into todo-xml
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelChirico authored Dec 15, 2023
2 parents 11cd69c + 6cbb24c commit 003814e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions R/condition_call_linter.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#'
#' @param display_call Logical specifying expected behaviour regarding `call.`
#' argument in conditions.
#' - `NA` forces providing `call.=` but ignores its value (this can be used in
#' - `NA` forces providing `call. =` but ignores its value (this can be used in
#' cases where you expect a mix of `call. = FALSE` and `call. = TRUE`)
#' - lints `call. = FALSE`
#' - forces `call. = FALSE` (lints `call. = TRUE` or missing `call.=` value)
#' - `TRUE` lints `call. = FALSE`
#' - `FALSE` forces `call. = FALSE` (lints `call. = TRUE` or missing `call. =` value)
#'
#'
#' @examples
Expand Down
2 changes: 1 addition & 1 deletion R/use_lintr.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#'
#' * `tidyverse` creates a minimal lintr config, based on the default linters ([linters_with_defaults()]).
#' These are suitable for following [the tidyverse style guide](https://style.tidyverse.org/).
#' * `full` creates a lintr config using all available linters via [linters_with_tags()].
#' * `full` creates a lintr config using all available linters via [all_linters()].
#'
#' @return Path to the generated configuration, invisibly.
#'
Expand Down
6 changes: 3 additions & 3 deletions man/condition_call_linter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/use_lintr.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 003814e

Please sign in to comment.