Skip to content

Commit

Permalink
Revision
Browse files Browse the repository at this point in the history
  • Loading branch information
hadley committed Jun 2, 2018
1 parent f1a92a9 commit e79ab51
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Authors@R: c(
Description: R's default conflict management system gives the most recently
loaded package precedence. This can make it hard to detect conflicts,
particularly when they arise because a package update creates ambiguity
that did not previously exist. conflicted takes a different approach,
that did not previously exist. 'conflicted' takes a different approach,
making every conflict an error and forcing you to choose which function
to use.
License: GPL-3
Expand Down
10 changes: 10 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
This is a resubmission

* I have added single quotes around conflicted in the DESCRIPTION

* conflicted is designed for interactive usage only and it does not
export any functions. Therefore it is not possible to include an
executable example in the documentation.

---

## Test environments
* OS X install: R 3.4
* win-builder: R-devel
Expand Down

0 comments on commit e79ab51

Please sign in to comment.