Module Name:	pkgsrc
Committed By:	abs
Date:		Mon Jul 31 17:16:00 UTC 2000

Modified Files:
	pkgsrc/net/netatalk: Makefile
	pkgsrc/net/netatalk/files: patch-sum

Log Message:
Add CONFLICTS for netatalk-asun


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 pkgsrc/net/netatalk/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/net/netatalk/files/patch-sum

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