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 /lib/memtypes.c | |
| 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 'lib/memtypes.c')
| -rw-r--r-- | lib/memtypes.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/memtypes.c b/lib/memtypes.c index 5c2c9034..bec6663c 100644 --- a/lib/memtypes.c +++ b/lib/memtypes.c @@ -6,7 +6,11 @@ * The script is sensitive to the format (though not whitespace), see * the top of memtypes.awk for more details. * +<<<<<<< HEAD:lib/memtypes.c * $Id: memtypes.c,v 1.13 2008/07/21 21:02:50 paul Exp $ +======= + * $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/memtypes.c */ #include "zebra.h" |