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

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

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/man/man5/canonical.5
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/man/man5/virtual.5

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