From: Pablo Llopis Date: Thu, 3 Jan 2019 01:11:20 +0000 (+0100) Subject: fix merge conflict in configure.ac X-Git-Tag: collectd-5.11.0~3^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=964771234afccb398c9d066dd45c0d4409d5626e;p=thirdparty%2Fcollectd.git fix merge conflict in configure.ac --- diff --git a/configure.ac b/configure.ac index d97040b89..443c0bcb5 100644 --- a/configure.ac +++ b/configure.ac @@ -7261,11 +7261,8 @@ AC_MSG_RESULT([ librouteros . . . . . $with_librouteros]) AC_MSG_RESULT([ librrd . . . . . . . $with_librrd]) AC_MSG_RESULT([ libsensors . . . . . $with_libsensors]) AC_MSG_RESULT([ libsigrok . . . . . $with_libsigrok]) -<<<<<<< HEAD AC_MSG_RESULT([ libssl . . . . . . . $with_libssl]) -======= AC_MSG_RESULT([ libslurm . . . . . . $with_libslurm]) ->>>>>>> Add new slurm plugin AC_MSG_RESULT([ libstatgrab . . . . . $with_libstatgrab]) AC_MSG_RESULT([ libtokyotyrant . . . $with_libtokyotyrant]) AC_MSG_RESULT([ libudev . . . . . . . $with_libudev])