Skip to content

Commit

Permalink
And description
Browse files Browse the repository at this point in the history
  • Loading branch information
hadley committed Oct 30, 2023
1 parent dc018f6 commit adf95f8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Package: conflicted
Title: An Alternative Conflict Resolution Strategy
Version: 1.2.0
Authors@R: c(
person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre")),
person("RStudio", role = c("cph", "fnd"))
person("Hadley", "Wickham", , "hadley@posit.co", role = c("aut", "cre")),
person("Posit Software, PBC", role = c("cph", "fnd"))
)
Description: R's default conflict management system gives the most
recently loaded package precedence. This can make it hard to detect
Expand All @@ -15,7 +15,7 @@ License: MIT + file LICENSE
URL: https://conflicted.r-lib.org/, https://github.com/r-lib/conflicted
BugReports: https://github.com/r-lib/conflicted/issues
Depends:
R (>= 3.2)
R (>= 3.6)
Imports:
cli (>= 3.4.0),
memoise,
Expand Down

0 comments on commit adf95f8

Please sign in to comment.