Module Name:	pkgsrc
Committed By:	jlam
Date:		Tue Feb 20 19:36:31 UTC 2001

Modified Files:
	pkgsrc/sysutils/psmisc: Makefile
	pkgsrc/sysutils/pstree: Makefile

Log Message:
Note CONFLICTS with each other.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 pkgsrc/sysutils/psmisc/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/sysutils/pstree/Makefile

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