diff options
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/ripd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ripd/ripd.c b/ripd/ripd.c index 2525679c..632d338e 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -84,7 +84,10 @@ static const struct message rip_msg[] = {RIP_TRACEOFF, "TRACEOFF"}, {RIP_POLL, "POLL"}, {RIP_POLL_ENTRY, "POLL ENTRY"}, +<<<<<<< HEAD:ripd/ripd.c +======= {0, NULL}, +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:ripd/ripd.c }; /* Utility function to set boradcast option to the socket. */ |