Module Name:	pkgsrc
Committed By:	kei
Date:		Wed Aug 30 17:44:26 UTC 2000

Modified Files:
	pkgsrc/net/samba: Makefile

Log Message:
added conflicts with pkgsrc/japanese/samba.


To generate a diff of this commit:
cvs rdiff -r1.34 -r1.35 pkgsrc/net/samba/Makefile

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