Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Apr  5 21:40:54 UTC 2003

Modified Files:
	pkgsrc/editors/jed: Makefile
	pkgsrc/editors/xjed: Makefile

Log Message:
Add conflicts between jed and xjed.


To generate a diff of this commit:
cvs rdiff -r1.22 -r1.23 pkgsrc/editors/jed/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/editors/xjed/Makefile

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