diff options
| author | John Marino <marino@FreeBSD.org> | 2014-08-19 12:26:49 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-08-19 12:26:49 +0000 |
| commit | 3cb96b5bc50cd0578181378e8ab25462a2f6fae3 (patch) | |
| tree | b0971d20ed359205b85d28052ebf8f8f76174cfd /mail/Makefile | |
| parent | 459860b0f7316e2bd5f209c43652398e2c929dcb (diff) | |
Move mail/rss2email => mail/rss2email2
This is done to avoid confusion with mail/rss2email3. Also update the
conflicts line of rss2email3 that broke with the recent update of
mail/rss2email. This is the second part of the PR.
PR: 190381
Submitted by: Stephen Guglielmo
Notes
Notes:
svn path=/head/; revision=365373
Diffstat (limited to 'mail/Makefile')
| -rw-r--r-- | mail/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mail/Makefile b/mail/Makefile index f2dcff10e2ec..6140bfe2c522 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -597,7 +597,7 @@ SUBDIR += roundcube-umich SUBDIR += roundcube-veximaccountadmin SUBDIR += rspamd - SUBDIR += rss2email + SUBDIR += rss2email2 SUBDIR += rss2email3 SUBDIR += ruby-rfilter SUBDIR += ruby-rmail |