redhat: Remove accidental leftover HEAD tag from merge

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index d7cb517ea87538aab15bd5fa500de5965cafde23..57deeae2ab9cc613da3e8b97497af93548738b89 100644 (file)
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -10,7 +10,6 @@
 
 #################### FRRouting (FRR) configure options #####################
 # with-feature options
-<<<<<<< HEAD
 %{!?with_tcp_zebra:            %global with_tcp_zebra          0 }
 %{!?with_pam:                  %global with_pam                0 }
 %{!?with_ospfclient:           %global with_ospfclient         1 }