diff options
Diffstat (limited to 'zebra/rtadv.h')
| -rw-r--r-- | zebra/rtadv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/zebra/rtadv.h b/zebra/rtadv.h index 658bc5ff..abd1c6fc 100644 --- a/zebra/rtadv.h +++ b/zebra/rtadv.h @@ -23,10 +23,7 @@ #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. */ |