Module Name:	pkgsrc
Committed By:	xtraeme
Date:		Sat Dec  9 00:52:23 UTC 2006

Modified Files:
	pkgsrc/devel/apr: Makefile
	pkgsrc/devel/apr1: Makefile

Log Message:
There's no need to CONFLICT between apr and apr1, cube said so.


To generate a diff of this commit:
cvs rdiff -r1.48 -r1.49 pkgsrc/devel/apr/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/devel/apr1/Makefile

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