Module Name:	pkgsrc
Committed By:	hubertf
Date:		Wed Aug 30 04:14:51 UTC 2000

Modified Files:
	pkgsrc/net: Makefile

Log Message:
Remove conflict-clutter that should not have happened.
Noted by Jun Ebihara <jun@soum.co.jp>


To generate a diff of this commit:
cvs rdiff -r1.150 -r1.151 pkgsrc/net/Makefile

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