Module Name:	htdocs
Committed By:	jschauma
Date:		Sun Dec  7 17:56:04 UTC 2003

Modified Files:
	htdocs/Changes: index.html

Log Message:
Remove CVS conflict.


To generate a diff of this commit:
cvs rdiff -r1.976 -r1.977 htdocs/Changes/index.html

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