Module Name:	src
Committed By:	perry
Date:		Tue Dec 24 20:26:59 UTC 2002

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

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/conf/post-install

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