Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/editors/emacs/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/editors/emacs/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pkgsrc/editors/emacs/Makefile	1999/02/04 14:54:25	1.24
+++ pkgsrc/editors/emacs/Makefile	1999/02/20 22:48:27	1.25
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/02/04 14:54:25 frueauf Exp $
+# $NetBSD: Makefile,v 1.25 1999/02/20 22:48:27 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 #
 
@@ -9,8 +9,6 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 
-CONFLICTS=	emacs-20.2
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=--with-pop --with-x --with-x-toolkit=lucid