diff options
author | ache <ache@FreeBSD.org> | 1997-01-03 08:29:46 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1997-01-03 08:29:46 +0000 |
commit | b34e6f29a2c966a2a70cf9582b3f4073179c0b55 (patch) | |
tree | d68fc4ad5ed07c085ba73aba82791ff8fe937125 | |
parent | 49da9c318abfefcdb7e7d9b3d47da5d3bf24827d (diff) | |
download | FreeBSD-src-b34e6f29a2c966a2a70cf9582b3f4073179c0b55.zip FreeBSD-src-b34e6f29a2c966a2a70cf9582b3f4073179c0b55.tar.gz |
Merge to eliminate conflict
-rw-r--r-- | sbin/routed/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/routed/input.c b/sbin/routed/input.c index cfc680d..f177226 100644 --- a/sbin/routed/input.c +++ b/sbin/routed/input.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) static char rcsid[] = "$NetBSD$"; #endif -#ident "$Revision: 1.20 $" +#ident "$Revision: 1.1.1.5 $" #include "defs.h" |