diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
| commit | 42cd26ed298eee43b237d41e84718b045e147e90 (patch) | |
| tree | d02b89f1094853ddf9533b627630919889313fea /sbin/routed/rdisc.c | |
| parent | 937e4ba86d9feec57e270077050fe1ec9a365c2b (diff) | |
| download | FreeBSD-src-42cd26ed298eee43b237d41e84718b045e147e90.zip FreeBSD-src-42cd26ed298eee43b237d41e84718b045e147e90.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'sbin/routed/rdisc.c')
| -rw-r--r-- | sbin/routed/rdisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c index 764463a..56eed8c 100644 --- a/sbin/routed/rdisc.c +++ b/sbin/routed/rdisc.c @@ -41,7 +41,7 @@ #if !defined(sgi) && !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c 8.1 (Berkeley) x/y/95"; #elif defined(__NetBSD__) -__RCSID"$NetBSD$"); +__RCSID("$NetBSD$"); #endif #ident "$FreeBSD$" |
