Module Name:	pkgsrc
Committed By:	adrianp
Date:		Sun Apr  3 14:11:25 UTC 2005

Modified Files:
	pkgsrc/chat/dircproxy: Makefile

Log Message:
- Add CONFLICTS for the upcoming import of dircproxy-devel which is the 1.1.x
  branch.


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 pkgsrc/chat/dircproxy/Makefile

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