summaryrefslogtreecommitdiff
path: root/editors/emacs22/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'editors/emacs22/Makefile')
-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]*