summaryrefslogtreecommitdiff
path: root/editors/emacs22
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2005-12-18 13:39:42 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2005-12-18 13:39:42 +0000
commit4c39fff95c8b945ba1101ea736017458f29e8a82 (patch)
treed1c43fd570fa06c7284b6c7c835d00fcecca31d7 /editors/emacs22
parentSubmitter of last update (Melvyn Sopacua <portmaint@melvyn.homeunix.org>) (diff)
Remove emacs20 from CONFLICTS.
PR: ports/90475 Submitted by: NIIMI Satoshi <sa2c@sa2c.net>
Notes
Notes: svn path=/head/; revision=151485
Diffstat (limited to 'editors/emacs22')
-rw-r--r--editors/emacs22/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 00713861161a..fd0d1c0e4327 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= GNU editing macros
-CONFLICTS= emacs-19.* emacs-20.* \
+CONFLICTS= emacs-19.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*