diff options
| author | Lou Berger <lberger@labn.net> | 2017-01-27 14:30:27 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-27 14:31:41 -0500 |
| commit | 1edcd64259473988969f3029ccdf87f36c4cda28 (patch) | |
| tree | 6baa40c884ca5adce313bc3e8e68fe786747354d /ospf6d/ospf6_zebra.c | |
| parent | 7395a2c994953a9ee773ce94addea5b3b50c18bf (diff) | |
bgp: Fix merge mistake
I choose the wrong merge direction. Fixed.
Signed-off-by: Lou Berger <lberger@labn.net>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ospf6d/ospf6_zebra.c')
0 files changed, 0 insertions, 0 deletions
