Module Name:	pkgsrc
Committed By:	rillig
Date:		Tue Jun  5 05:58:57 UTC 2007

Modified Files:
	pkgsrc/doc: CHANGES-2007

Log Message:
Removed CVS conflict markers from my last commit.


To generate a diff of this commit:
cvs rdiff -r1.1221 -r1.1222 pkgsrc/doc/CHANGES-2007

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