a92b987411
unresolved merge conflicts. Pointy hat to: hrs |
||
---|---|---|
.. | ||
Makefile | ||
Makefile.depend | ||
pathnames.h | ||
syslog.conf.5 | ||
syslogd.8 | ||
syslogd.c |
a92b987411
unresolved merge conflicts. Pointy hat to: hrs |
||
---|---|---|
.. | ||
Makefile | ||
Makefile.depend | ||
pathnames.h | ||
syslog.conf.5 | ||
syslogd.8 | ||
syslogd.c |