diff options
Diffstat (limited to 'bgpd/bgp_vty.c')
| -rw-r--r-- | bgpd/bgp_vty.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 7acf27cc..b2164503 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -9872,7 +9872,10 @@ bgp_vty_init (void) /* "show bgp memory" commands. */ install_element (VIEW_NODE, &show_bgp_memory_cmd); +<<<<<<< HEAD:bgpd/bgp_vty.c +======= install_element (RESTRICTED_NODE, &show_bgp_memory_cmd); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:bgpd/bgp_vty.c install_element (ENABLE_NODE, &show_bgp_memory_cmd); /* Community-list. */ |