]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #1079 from qlyoung/fix-style-a
authorRenato Westphal <renato@openbsd.org>
Thu, 31 Aug 2017 16:22:55 +0000 (13:22 -0300)
committerGitHub <noreply@github.com>
Thu, 31 Aug 2017 16:22:55 +0000 (13:22 -0300)
*: fix style

1  2 
bgpd/bgp_evpn.c
bgpd/bgp_route.c
zebra/if_netlink.c
zebra/interface.c
zebra/redistribute.c
zebra/rt_netlink.c
zebra/zebra_rib.c
zebra/zebra_vty.c
zebra/zebra_vxlan.c
zebra/zserv.c

diff --cc bgpd/bgp_evpn.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc zebra/zserv.c
Simple merge