Module Name:	pkgsrc
Committed By:	xtraeme
Date:		Fri Dec  8 23:51:38 UTC 2006

Modified Files:
	pkgsrc/www/apache2: Makefile

Log Message:
This package cannot co-exist with apache22, update CONFLICTS
properly.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -r1.106 -r1.107 pkgsrc/www/apache2/Makefile

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