From e8d071b4edfdf8f26432881653d3da4d4375fa33 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Fri, 19 Sep 2003 11:57:51 +0000
Subject: Revert version 1.81, as the mods it contained weren't necessary.

---
 www/apache6/Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'www')

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 8abf582d2d1..423826d9176 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2003/09/17 19:41:19 grant Exp $
+# $NetBSD: Makefile,v 1.82 2003/09/19 11:57:51 agc Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -8,12 +8,7 @@
 
 DISTNAME=		apache_${APACHE_VERSION}
 PKGNAME=		apache6-${APACHE_VERSION}
-<<<<<<< Makefile
-#PKGREVISION=		3
 APACHE_VERSION=		1.3.28
-=======
-APACHE_VERSION=		1.3.28
->>>>>>> 1.79
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
-- 
cgit v1.2.3