diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 15:58:09 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 15:58:09 +0100 |
commit | a8ae9582ec88c247124bd983ef7e6f6ef7352006 (patch) | |
tree | afbf88fb87a031ad9492af7385bc5cc3deda0961 /tests/imtcp_addtlframedelim.sh | |
parent | ee6f5c8ff735cf9a541318c5c59e5c13c6d328c7 (diff) | |
download | rsyslog-a8ae9582ec88c247124bd983ef7e6f6ef7352006.tar.gz rsyslog-a8ae9582ec88c247124bd983ef7e6f6ef7352006.tar.bz2 rsyslog-a8ae9582ec88c247124bd983ef7e6f6ef7352006.zip |
fix merge problem
Diffstat (limited to 'tests/imtcp_addtlframedelim.sh')
0 files changed, 0 insertions, 0 deletions