summaryrefslogtreecommitdiffstats
path: root/plugins/imfile/imfile.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-28 08:24:50 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-28 08:24:50 +0200
commit26ab13d9763c3a9cb6beb429edb81c9774141537 (patch)
tree8c3fc0a484dff1196f9f22ef6cacdaa9c4ee06ab /plugins/imfile/imfile.c
parent53df5066688c8472a9f7be5c86bbc253378e6572 (diff)
parentcf0fd87e17db12dd28edd260d02d0e5aa96deb71 (diff)
downloadrsyslog-26ab13d9763c3a9cb6beb429edb81c9774141537.tar.gz
rsyslog-26ab13d9763c3a9cb6beb429edb81c9774141537.tar.bz2
rsyslog-26ab13d9763c3a9cb6beb429edb81c9774141537.zip
Merge branch 'v6-devel-input' into v6-devel
Diffstat (limited to 'plugins/imfile/imfile.c')
-rw-r--r--plugins/imfile/imfile.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 462a5e78..453b6b05 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -562,7 +562,6 @@ finalize_it:
ENDsetModCnf
-
BEGINendCnfLoad
CODESTARTendCnfLoad
if(!loadModConf->configSetViaV2Method) {