aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authorgarga <garga@FreeBSD.org>2006-08-27 03:15:08 +0800
committergarga <garga@FreeBSD.org>2006-08-27 03:15:08 +0800
commite275fe0e2c4ac1b1ba155ab7b6c037aa43142854 (patch)
treecb9d05cd6bfe90a789598b0153cf384b3d32e678 /japanese
parent1083915622583384ed03ddedd1c71cef0ffab41c (diff)
downloadfreebsd-ports-gnome-e275fe0e2c4ac1b1ba155ab7b6c037aa43142854.tar.gz
freebsd-ports-gnome-e275fe0e2c4ac1b1ba155ab7b6c037aa43142854.tar.zst
freebsd-ports-gnome-e275fe0e2c4ac1b1ba155ab7b6c037aa43142854.zip
Unregister CONFLICTS with recently removed net-im/gaim-devel
Diffstat (limited to 'japanese')
-rw-r--r--japanese/gaim/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/japanese/gaim/Makefile b/japanese/gaim/Makefile
index e151169dd9d3..f1cbd4b877da 100644
--- a/japanese/gaim/Makefile
+++ b/japanese/gaim/Makefile
@@ -16,6 +16,6 @@ MAINTAINER= freebsd@next-generation.org
MASTERDIR= ${.CURDIR}/../../net-im/gaim
MD5_FILE= ${.CURDIR}/distinfo
-CONFLICTS= gaim-[0-9]* gaim-devel-[0-9]*
+CONFLICTS= gaim-[0-9]*
.include "${MASTERDIR}/Makefile"