From 3ea2989c33e6e3f59ed5e59da49c9be231a9aaac Mon Sep 17 00:00:00 2001
From: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Fri, 22 Jul 2005 04:28:04 +0000
Subject: - Remove CONFLICTS since we only have 1 galeon now.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4287 df743ca5-7f9a-e211-a948-0013205c9059
---
 www/galeon/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 6c89fc76e..954cb0787 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/www/galeon/Makefile,v 1.1 2005/07/22 04:27:17 ahze Exp $
 #
 
 PORTNAME=	galeon
@@ -62,8 +62,6 @@ GCONF_SCHEMAS=	galeon.schemas
 
 FLASHPLAYER=	${LOCALBASE}/lib/libflashplayer.so.1
 
-CONFLICTS=	galeon-[0-9]*
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500000
-- 
cgit v1.2.3