X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=configure.ac;h=3ff2189f5411726adcc1d0dbe4bed4ddb0012412;hp=d9ea739751cb4ba01119fcffb323bcbe53c21b3f;hb=f4a66f28be65f7c9ab1265adde87a3e6cc35540a;hpb=2c437d9e9fa953b9535a98e9bb0f36f4f0bddd28

diff --git a/configure.ac b/configure.ac
index d9ea7397..3ff2189f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6480,18 +6480,15 @@ if test "x$ac_system" = "xLinux"; then
   if test "x$with_libyajl" = "xyes" && test "x$with_libyajl2" = "xyes"; then
     plugin_ovs_events="yes"
     plugin_ovs_stats="yes"
-<<<<<<< HEAD
     plugin_procevent="yes"
-  fi
-
-  if test "x$have_pci_regs_h" = "xyes"; then
-    plugin_pcie_errors="yes"
-=======
 
     if test "x$with_libmnl" = "xyes"; then
       plugin_connectivity="yes"
     fi
->>>>>>> connectivity notifications
+  fi
+
+  if test "x$have_pci_regs_h" = "xyes"; then
+    plugin_pcie_errors="yes"
   fi
 fi