Module Name: pkgsrc Committed By: rh Date: Tue May 30 11:03:44 UTC 2000 Modified Files: pkgsrc/textproc/libxml/files: md5 Log Message: Resolve conflicts To generate a diff of this commit: cvs rdiff -r1.6 -r1.7 pkgsrc/textproc/libxml/files/md5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.