Module Name:	pkgsrc
Committed By:	hubertf
Date:		Mon Oct 25 14:38:40 UTC 1999

Modified Files:
	pkgsrc/mail/elm: Makefile
	pkgsrc/mail/elm/files: md5 patch-sum
	pkgsrc/mail/elm/patches: patch-ad
	pkgsrc/mail/elm/pkg: PLIST

Log Message:
Remove conflicts


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 pkgsrc/mail/elm/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/mail/elm/files/md5
cvs rdiff -r1.1 -r1.2 pkgsrc/mail/elm/files/patch-sum
cvs rdiff -r1.3 -r1.4 pkgsrc/mail/elm/patches/patch-ad
cvs rdiff -r1.4 -r1.5 pkgsrc/mail/elm/pkg/PLIST

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