diff options
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" |