From cdafdeb1c3a36e7c0b59fd4f6f0b90b3b1cc27f8 Mon Sep 17 00:00:00 2001
From: fenner <fenner@FreeBSD.org>
Date: Wed, 20 Jan 1999 07:55:57 +0000
Subject: Merge conflicts from 3.9-beta3+IOS12.  The conflicts were huge; cvs's
 merge algorithm failed on several files, and the translation of the mrouted
 man page to mdoc didn't help...

---
 usr.sbin/mrouted/inet.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/mrouted/inet.c')

diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c
index 5af7218..fb10161 100644
--- a/usr.sbin/mrouted/inet.c
+++ b/usr.sbin/mrouted/inet.c
@@ -5,11 +5,14 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
+ *
+ *
+ * inet.c,v 3.8.4.2 1998/01/06 01:57:44 fenner Exp
  */
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: inet.c,v 1.9 1998/01/16 07:17:42 charnier Exp $";
 #endif /* not lint */
 
 #include "defs.h"
-- 
cgit v1.1