diff options
Diffstat (limited to 'lib/command.h')
| -rw-r--r-- | lib/command.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/command.h b/lib/command.h index 5a19874d..d093df3c 100644 --- a/lib/command.h +++ b/lib/command.h @@ -101,11 +101,7 @@ enum node_type DUMP_NODE, /* Packet dump node. */ FORWARDING_NODE, /* IP forwarding node. */ PROTOCOL_NODE, /* protocol filtering node */ -<<<<<<< HEAD:lib/command.h - VTY_NODE /* Vty node. */ -======= VTY_NODE, /* Vty node. */ ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/command.h }; /* Node which has some commands and prompt string and configuration |