source-changes: CVS commit: src/gnu/dist/postfix

Subject: CVS commit: src/gnu/dist/postfix
To: None <source-changes@NetBSD.org>
From: Rui Paulo <rpaulo@netbsd.org>
List: source-changes
Date: 04/06/2006 23:07:16

Module Name:	src
Committed By:	rpaulo
Date:		Thu Apr  6 23:07:16 UTC 2006

Modified Files:
	src/gnu/dist/postfix: postfix2netbsd
	src/gnu/dist/postfix/man/man5: postconf.5

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/postfix2netbsd
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/man/man5/postconf.5

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