Module Name:	src
Committed By:	rpaulo
Date:		Thu Aug 18 21:50:35 UTC 2005

Modified Files:
	src/gnu/dist/postfix/conf: main.cf master.cf post-install postfix-files
	    postfix-script

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/conf/master.cf
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/conf/postfix-files \
    src/gnu/dist/postfix/conf/postfix-script

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