diff options
Diffstat (limited to 'zebra/rtadv.h')
| -rw-r--r-- | zebra/rtadv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/zebra/rtadv.h b/zebra/rtadv.h index abd1c6fc..658bc5ff 100644 --- a/zebra/rtadv.h +++ b/zebra/rtadv.h @@ -23,7 +23,10 @@ #ifndef _ZEBRA_RTADV_H #define _ZEBRA_RTADV_H +<<<<<<< HEAD:zebra/rtadv.h +======= #include "vty.h" +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:zebra/rtadv.h #include "zebra/interface.h" /* Router advertisement prefix. */ |