Module Name:	pkgsrc
Committed By:	itojun
Date:		Fri Jul 23 18:20:05 UTC 1999

Modified Files:
	pkgsrc/www/ap-ssl: Makefile
	pkgsrc/www/apache: Makefile

Log Message:
add CONFLICTS+= apache6-*.


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 pkgsrc/www/ap-ssl/Makefile
cvs rdiff -r1.35 -r1.36 pkgsrc/www/apache/Makefile

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