diff options
| author | Andrey Slusar <anray@FreeBSD.org> | 2005-12-16 08:09:19 +0000 |
|---|---|---|
| committer | Andrey Slusar <anray@FreeBSD.org> | 2005-12-16 08:09:19 +0000 |
| commit | ea2b32129bae84ee9bb71ebed1b1ed04270b1dc1 (patch) | |
| tree | b00b2a610b7fbfa5f15a4ad5fa79d9b8d64cdc94 /editors/emacs19 | |
| parent | - Update to 1.3.6 (diff) | |
editors/emacs20 was changed not to conflict with other emacsen.
PR: ports/90476
Submitted by: NIIMI Satoshi <sa2c@sa2c.net>
Approved by: sem(mentor)
Notes
Notes:
svn path=/head/; revision=151293
Diffstat (limited to 'editors/emacs19')
| -rw-r--r-- | editors/emacs19/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile index 24684b6570be..191d5e03ee1d 100644 --- a/editors/emacs19/Makefile +++ b/editors/emacs19/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= emacs MAINTAINER= ports@FreeBSD.org COMMENT= GNU editing macros -CONFLICTS= emacs-21.* emacs-20.* \ +CONFLICTS= emacs-21.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* |