Module Name:	pkgsrc
Committed By:	xtraeme
Date:		Sat Dec  9 00:51:21 UTC 2006

Modified Files:
	pkgsrc/www/apache2: Makefile
	pkgsrc/www/apache22: Makefile

Log Message:
There's no need for CONFLICT between apache2 and apache22,
cube said so.


To generate a diff of this commit:
cvs rdiff -r1.107 -r1.108 pkgsrc/www/apache2/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/www/apache22/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.