[rsyslog] merge failures

Michael Biebl mbiebl at gmail.com
Thu Jul 30 13:29:11 CEST 2009


Hi,
just noticed this in v4-stable

grep "<<<<" * -R
tests/Makefile.am:<<<<<<< HEAD:tests/Makefile.am

Seems like a merge error.

Haven't checked the other branches.

Cheers,
Michael
-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



More information about the rsyslog mailing list