From: Andrew Bays <andrew.bays@gmail.com>
Date: Wed, 4 Sep 2019 19:51:51 +0000 (-0400)
Subject: Fix merge conflicts
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2388b9fd7b49cd9a16125859689ef7af7ce2c358

Fix merge conflicts
---

2388b9fd7b49cd9a16125859689ef7af7ce2c358