NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

explorer
Thu Sep 19 19:00:55 PDT 1996
Update of /a/cvsroot/src/usr.sbin/sendmail/src
In directory netbsd1:/var/slash-tmp/cvs-serv5629

Modified Files:
        conf.c 
Log Message:
resolve conflicts

explorer
Thu Sep 19 19:03:21 PDT 1996
Update of /a/cvsroot/src/usr.sbin/sendmail/src
In directory netbsd1:/var/slash-tmp/cvs-serv6362

Modified Files:
        conf.c 
Log Message:
fix botched conf.c update