[SVN-Commit] r1333 - trunk/www/linux-firefox

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Aug 23 03:02:22 2013
New Revision: 1333

Log:
r1331 followup: remove conflict non-esr port, too

Modified:
   trunk/www/linux-firefox/Makefile

Modified: trunk/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile	Fri Aug 23 02:50:04 2013	(r1332)
+++ trunk/www/linux-firefox/Makefile	Fri Aug 23 03:02:22 2013	(r1333)
@@ -10,7 +10,6 @@
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-CONFLICTS=	linux-firefox-24.* linux-firefox-1[07].*
 USE_BZIP2=	yes
 REPLACE_GRE=	yes