Module Name:	pkgsrc
Committed By:	kent
Date:		Tue Jun 25 14:16:20 UTC 2002

Added Files:
	pkgsrc/net/eggdrop: DESCR MESSAGE Makefile PLIST distinfo
	pkgsrc/net/eggdrop/patches: patch-aa patch-ab patch-ac patch-ad
	    patch-ae

Log Message:
Resolve the previous confilict.


To generate a diff of this commit:
cvs rdiff -r0 -r1.3 pkgsrc/net/eggdrop/DESCR pkgsrc/net/eggdrop/MESSAGE \
    pkgsrc/net/eggdrop/PLIST
cvs rdiff -r0 -r1.9 pkgsrc/net/eggdrop/Makefile
cvs rdiff -r0 -r1.4 pkgsrc/net/eggdrop/distinfo
cvs rdiff -r0 -r1.3 pkgsrc/net/eggdrop/patches/patch-aa \
    pkgsrc/net/eggdrop/patches/patch-ad pkgsrc/net/eggdrop/patches/patch-ae
cvs rdiff -r0 -r1.4 pkgsrc/net/eggdrop/patches/patch-ab \
    pkgsrc/net/eggdrop/patches/patch-ac

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