Signed-off-by: Angus Salkeld <[email protected]> --- corosync.spec.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/corosync.spec.in b/corosync.spec.in index 1eb07f0..ba54123 100644 --- a/corosync.spec.in +++ b/corosync.spec.in @@ -2,8 +2,6 @@ %global numcomm @numcomm@ %global dirty @dirty@ -<<<<<<< HEAD -======= # Conditionals # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>" # to disable or enable specific features @@ -13,7 +11,6 @@ %bcond_with snmp %bcond_with dbus ->>>>>>> 2a568d6... Add dbus and snmp notifier Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: @version@ -- 1.7.4 _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
