diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /zebra/rtadv.h | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'zebra/rtadv.h')
| -rw-r--r-- | zebra/rtadv.h | 4 |
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. */ |