Module Name:	pkgsrc
Committed By:	rillig
Date:		Wed Nov  9 23:53:28 UTC 2005

Modified Files:
	pkgsrc/audio/csound4: distinfo

Log Message:
Removed CVS conflict lines. Please use pkglint before committing changes.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/audio/csound4/distinfo

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