Module Name:	pkgsrc
Committed By:	salo
Date:		Wed Apr  7 13:13:18 UTC 2004

Modified Files:
	pkgsrc/chat/jabberd: Makefile

Log Message:
Fix CONFLICTS. (hi xtraeme!)


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/chat/jabberd/Makefile

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