Thanks Fixed in v4-stable now, will propagate to the other branches over time...
> -----Original Message----- > From: [email protected] [mailto:rsyslog- > [email protected]] On Behalf Of Michael Biebl > Sent: Thursday, July 30, 2009 1:29 PM > To: rsyslog-users > Subject: [rsyslog] merge failures > > 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? > _______________________________________________ > rsyslog mailing list > http://lists.adiscon.net/mailman/listinfo/rsyslog > http://www.rsyslog.com _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com
