Module Name: htdocs Committed By: grant Date: Thu May 30 05:46:13 UTC 2002 Modified Files: htdocs/de: index.html Log Message: resolve conflicts To generate a diff of this commit: cvs rdiff -r1.58 -r1.59 htdocs/de/index.html Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.