Module Name:	htdocs
Committed By:	rillig
Date:		Fri Mar 11 00:29:25 UTC 2005

Modified Files:
	htdocs/gallery/xearth: netbsd.markers

Log Message:
Removed the CVS conflict lines. Re-added wrstuden. Added myself.


To generate a diff of this commit:
cvs rdiff -r1.125 -r1.126 htdocs/gallery/xearth/netbsd.markers

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