collectd.conf(5): Fix a messed up merge.
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:25:20 +0000 (11:25 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:25:20 +0000 (11:25 +0100)
commitaf763dafe80f13e3992dd10287d17ed91c377757
treecff1c64678e1b637c051141eb1878fce0423a3ea
parentc89c9b7b5e498e5a77c6eb1b1a88593fcced85f5
collectd.conf(5): Fix a messed up merge.
src/collectd.conf.pod