Subject: CVS commit: src/gnu/dist/postfix/man/man5
To: None <>
From: john heasley <>
List: source-changes
Date: 11/13/2004 05:45:10
Module Name:	src
Committed By:	heas
Date:		Sat Nov 13 05:45:10 UTC 2004

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

Log Message:
Resolve conflicts

To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 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.