From 6484f4f93211661133b2679d1f88358f210e6e37 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Thu, 19 Jul 2001 15:04:41 +0000
Subject: Fix conflict entries: - Remove unnecessary "elm" entry - Add "mm"
 package.

---
 mail/elm/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'mail/elm/Makefile')

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index fb7eeb927c0..67aae3a76d8 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/07/18 20:04:11 martin Exp $
-#
+# $NetBSD: Makefile,v 1.17 2001/07/19 15:04:41 tron Exp $
 
 DISTNAME=		elm2.5.5
 PKGNAME=		elm-2.5.5
@@ -10,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.instinct.org/elm/
 COMMENT=		ELM Mail User Agent (without ME extensions)
 
-CONFLICTS=		elm-*
+CONFLICTS+=		mm-*
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
-- 
cgit v1.2.3