merge error
authorderaadt <deraadt@openbsd.org>
Wed, 10 Jan 1996 22:15:13 +0000 (22:15 +0000)
committerderaadt <deraadt@openbsd.org>
Wed, 10 Jan 1996 22:15:13 +0000 (22:15 +0000)
commit6bcd7f9a036f91d336606f33fd5d5764cf71245c
treefd53228edf6b4a0bf9b988a6118c06d1867dc47b
parent3bb7591913672d139dbd1dbafdc18d49c3b76e5b
merge error
usr.sbin/syslogd/syslogd.c