summaryrefslogtreecommitdiffstats
path: root/zebra/rtadv.h
diff options
context:
space:
mode:
Diffstat (limited to 'zebra/rtadv.h')
-rw-r--r--zebra/rtadv.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/zebra/rtadv.h b/zebra/rtadv.h
index 36655037..658bc5ff 100644
--- a/zebra/rtadv.h
+++ b/zebra/rtadv.h
@@ -23,6 +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. */