From d23670ca0348f990fdd801bf15904ecf2df569ff Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Mon, 5 Jun 2017 14:19:15 -0700 Subject: redhat: Remove accidental leftover HEAD tag from merge Signed-off-by: Martin Winter --- redhat/frr.spec.in | 1 - 1 file changed, 1 deletion(-) (limited to 'redhat/frr.spec.in') diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index d7cb517ea..57deeae2a 100644 --- 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 } -- cgit v1.2.3