fix indention, revert merge failures
authorWilfried Goesgens <willi@arangodb.com>
Thu, 28 Sep 2017 09:34:42 +0000 (11:34 +0200)
committerWilfried Goesgens <willi@arangodb.com>
Thu, 28 Sep 2017 09:34:42 +0000 (11:34 +0200)
commit5b36272b7347f2f28b8c1ab02a20c4b93a54c20f
treee52ed77bf7697e65f4a26e61a4af9397452db6a2
parent04781eeec27d8f3e6700669203f5bdaabbe6e16a
fix indention, revert merge failures
src/collectd.conf.in
src/processes.c