From owner-cvs-sbin  Mon Jan  6 09:39:40 1997
Return-Path: <owner-cvs-sbin>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id JAA18153
          for cvs-sbin-outgoing; Mon, 6 Jan 1997 09:39:40 -0800 (PST)
Received: from halloran-eldar.lcs.mit.edu (halloran-eldar.lcs.mit.edu [18.26.0.159])
          by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id JAA18126;
          Mon, 6 Jan 1997 09:39:23 -0800 (PST)
Received: by halloran-eldar.lcs.mit.edu; (5.65v3.2/1.1.8.2/19Aug95-0530PM)
	id AA15511; Mon, 6 Jan 1997 12:39:16 -0500
Date: Mon, 6 Jan 1997 12:39:16 -0500
From: Garrett Wollman <wollman@mintaka.LCS.MIT.EDU>
Message-Id: <9701061739.AA15511@halloran-eldar.lcs.mit.edu>
To: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org,
        cvs-sbin@freefall.freebsd.org
Subject: cvs commit:  src/sbin/routed - Imported sources
In-Reply-To: <199701061724.JAA17222@freefall.freebsd.org>
References: <199701061724.JAA17222@freefall.freebsd.org>
Sender: owner-cvs-sbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

<<On Mon, 6 Jan 1997 09:24:57 -0800 (PST), Garrett Wollman <wollman@freefall.freebsd.org> said:

>   C src/sbin/routed/input.c

This conflict isn't real.

-GAWollman

--
Garrett A. Wollman   | O Siem / We are all family / O Siem / We're all the same
wollman@lcs.mit.edu  | O Siem / The fires of freedom 
Opinions not those of| Dance in the burning flame
MIT, LCS, ANA, or NSA|                     - Susan Aglukark and Chad Irschick