Subject: CVS commit: wip/rsyslog7
From: Filip Hajny
Date: 2013-10-23 13:10:25
Message id: E1VYwKp-0000fF-7a@sfs-ml-3.v29.ch3.sourceforge.com
Log Message:
Remove entirely redundant and annoying CONFLICTS
Files:
RevisionActionfile
1.5modifywip/rsyslog7/Makefile