From 93812aa17a91cf0f9e3f9a83752705f0346e463e Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Sat, 26 Aug 2006 19:15:08 +0000 Subject: Unregister CONFLICTS with recently removed net-im/gaim-devel --- japanese/gaim/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'japanese') 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" -- cgit v1.2.3