Module Name:	gnusrc
Committed By:	perry
Date:		Sat Dec  9 17:28:46 UTC 2000

Modified Files:
	gnusrc/gnu/dist/postfix/util: dict_db.c dict_dbm.c dict_open.c
	    watchdog.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/postfix/util/dict_db.c \
    gnusrc/gnu/dist/postfix/util/dict_dbm.c \
    gnusrc/gnu/dist/postfix/util/watchdog.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/postfix/util/dict_open.c

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