From 6f5b03cdf2f28bc1c745f22b7db6c31821edb267 Mon Sep 17 00:00:00 2001 From: pgollucci Date: Wed, 5 May 2010 23:16:08 +0000 Subject: - add caudium14 conflict - fix caudium12 conflict With Hat: apache@ --- www/apache20/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/apache20/Makefile b/www/apache20/Makefile index f23f3fb22293..b6f2c0dfdd95 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -32,7 +32,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ apache+mod_ssl+mod_snmp+mod_accel-1.* \ apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \ - caudium-devel-1.* caudium10-1.* caudium12-* \ + caudium-devel-1.* caudium10-1.* caudium12-1.* caudium14-1.* \ ru-apache+mod_ssl-1.* ru-apache-1.* # patch files -- cgit