Module Name: gnusrc
Committed By: perry
Date: Sun Feb 3 03:27:18 UTC 2002
Modified Files:
gnusrc/gnu/dist/postfix: makedefs
gnusrc/gnu/dist/postfix/conf: main.cf
gnusrc/gnu/dist/postfix/src/global: resolve_local.c
gnusrc/gnu/dist/postfix/src/master: master.h
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 gnusrc/gnu/dist/postfix/makedefs
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/postfix/src/global/resolve_local.c
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/postfix/src/master/master.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.