diff options
Diffstat (limited to 'isisd/dict.c')
-rw-r--r-- | isisd/dict.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/isisd/dict.c b/isisd/dict.c index 6c3e1e7f..b2bb5940 100644 --- a/isisd/dict.c +++ b/isisd/dict.c @@ -14,8 +14,13 @@ * into proprietary software; there is no requirement for such software to * contain a copyright notice related to this source. * +<<<<<<< HEAD:isisd/dict.c + * $Id: dict.c,v 1.5 2007/08/07 18:49:18 paul Exp $ + * $Name: $ +======= * $Id$ * $Name$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:isisd/dict.c */ #include <stdlib.h> |