Module Name:	pkgsrc
Committed By:	grant
Date:		Sat Mar  6 15:08:32 UTC 2004

Added Files:
	pkgsrc/mail/postfix-current: Makefile
	pkgsrc/mail/postfix-current/files: mailer.conf
	pkgsrc/mail/postfix-current/patches: patch-aa patch-ab patch-ac
	    patch-ad patch-ae patch-af patch-ah patch-ai patch-bd patch-be

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r0 -r1.25 pkgsrc/mail/postfix-current/Makefile
cvs rdiff -r0 -r1.3 pkgsrc/mail/postfix-current/files/mailer.conf
cvs rdiff -r0 -r1.11 pkgsrc/mail/postfix-current/patches/patch-aa
cvs rdiff -r0 -r1.5 pkgsrc/mail/postfix-current/patches/patch-ab
cvs rdiff -r0 -r1.3 pkgsrc/mail/postfix-current/patches/patch-ac \
    pkgsrc/mail/postfix-current/patches/patch-ad \
    pkgsrc/mail/postfix-current/patches/patch-ae \
    pkgsrc/mail/postfix-current/patches/patch-ah \
    pkgsrc/mail/postfix-current/patches/patch-ai \
    pkgsrc/mail/postfix-current/patches/patch-bd \
    pkgsrc/mail/postfix-current/patches/patch-be
cvs rdiff -r0 -r1.8 pkgsrc/mail/postfix-current/patches/patch-af

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