[Lunar-commits] <moonbase> proftpd: add pure-ftpd in the CONFLICTS file.

[Florin Braescu]

commit 2cd383dd7e1b7992cdf3d90222cb91e997fbcdfd
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sat Jan 23 13:35:29 2010 +0200

    proftpd: add pure-ftpd in the CONFLICTS file.
---
 ftp/proftpd/CONFLICTS |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ftp/proftpd/CONFLICTS b/ftp/proftpd/CONFLICTS
index 871046f..009ac83 100644
--- a/ftp/proftpd/CONFLICTS
+++ b/ftp/proftpd/CONFLICTS
@@ -1,2 +1,4 @@
-conflicts wu-ftpd &&
+conflicts wu-ftpd
 conflicts vsftpd
+conflicts pure-ftpd
+