From: Andrew Bays <andrew.bays@gmail.com>
Date: Wed, 4 Sep 2019 17:12:23 +0000 (-0400)
Subject: Fix merge conflicts
X-Git-Tag: 5.10.0~12^2~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb6f39121fa48db23021d0089bbbdd4616a8cccc;p=thirdparty%2Fcollectd.git

Fix merge conflicts
---

eb6f39121fa48db23021d0089bbbdd4616a8cccc
diff --cc AUTHORS
index a271a5e51,bf785f69f..81378c234
--- a/AUTHORS
+++ b/AUTHORS
@@@ -63,12 -62,12 +63,15 @@@ Andrew Bays <abays at redhat.com
  Andy Parkins <andyp at fussylogic.co.uk>
   - battery plugin: sysfs code.
  
+ Aneesh Puttur <aputtur at redhat.com>
+  - connectivity plugin.
+ 
  Andy Smith <ansmith at redhat.com>
   - AMQP 1.0 plugin.
-  
+ 
 +Aneesh Puttur <aputtur at redhat.com>
 + - connectivity plugin.
 +
  Anthony Dewhurst <dewhurst at gmail.com>
   - zfs_arc plugin.