Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Dec 16 13:56:40 UTC 2000

Modified Files:
	pkgsrc/editors/emacs: Makefile
	pkgsrc/editors/mule: Makefile

Log Message:
emacs and mule install files with the same name in info -- make
them CONFLICT.


To generate a diff of this commit:
cvs rdiff -r1.39 -r1.40 pkgsrc/editors/emacs/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/editors/mule/Makefile

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