diff options
author | Martin Winter <mwinter@opensourcerouting.org> | 2017-06-05 23:19:15 +0200 |
---|---|---|
committer | Martin Winter <mwinter@opensourcerouting.org> | 2017-06-05 23:19:15 +0200 |
commit | d23670ca0348f990fdd801bf15904ecf2df569ff (patch) | |
tree | 27759bad57384370cc45669586dd7603dd34af13 /redhat/frr.spec.in | |
parent | Merge remote-tracking branch 'origin/stable/2.0' (diff) | |
download | frr-d23670ca0348f990fdd801bf15904ecf2df569ff.tar.xz frr-d23670ca0348f990fdd801bf15904ecf2df569ff.zip |
redhat: Remove accidental leftover HEAD tag from merge
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'redhat/frr.spec.in')
-rw-r--r-- | redhat/frr.spec.in | 1 |
1 files changed, 0 insertions, 1 deletions
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 } |