diff options
Diffstat (limited to 'ospf6d/ospf6_route.h')
| -rw-r--r-- | ospf6d/ospf6_route.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ospf6d/ospf6_route.h b/ospf6d/ospf6_route.h index d12e0ce0..3ee52b5f 100644 --- a/ospf6d/ospf6_route.h +++ b/ospf6d/ospf6_route.h @@ -279,18 +279,10 @@ extern struct ospf6_route *ospf6_route_match_head (struct prefix *prefix, extern struct ospf6_route *ospf6_route_match_next (struct prefix *prefix, struct ospf6_route *route); -<<<<<<< HEAD:ospf6d/ospf6_route.h -void ospf6_route_remove_all (struct ospf6_route_table *); -struct ospf6_route_table *ospf6_route_table_create (int s, int t); -void ospf6_route_table_delete (struct ospf6_route_table *); -void ospf6_route_dump (struct ospf6_route_table *table); -======= extern void ospf6_route_remove_all (struct ospf6_route_table *); extern struct ospf6_route_table *ospf6_route_table_create (int s, int t); extern void ospf6_route_table_delete (struct ospf6_route_table *); extern void ospf6_route_dump (struct ospf6_route_table *table); ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:ospf6d/ospf6_route.h - extern void ospf6_route_show (struct vty *vty, struct ospf6_route *route); extern void ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route); |