fix merge conflict in configure.ac

diff --git a/configure.ac b/configure.ac
index d97040b89d0089d8ffe1a37543d50083f4a9e41f..443c0bcb5f9c25efa7a4d419d04915254c1a580a 100644 (file)
--- 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])