Module Name:	pkgsrc
Committed By:	adrianp
Date:		Thu Jan 20 21:17:48 UTC 2005

Modified Files:
	pkgsrc/devel/libnet: Makefile

Log Message:
Add conflict for newly imported libnet 1.1.x branch


To generate a diff of this commit:
cvs rdiff -r1.20 -r1.21 pkgsrc/devel/libnet/Makefile

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