perry fd9be39827 fix 3128 from SAITOH Masanobu. ... this consisted of nuking a duplicated paragraph; I did it slightly differently than suggested.		1997-03-25 19:51:21 +00:00
..
rtquery	- resolve conflicts.	1997-02-03 22:02:51 +00:00
Makefile	- resolve conflicts.	1997-02-03 22:02:51 +00:00
defs.h	- resolve conflicts.	1997-02-03 22:02:51 +00:00
if.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00
input.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00
main.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00
output.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00
parms.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00
pathnames.h	- resolve conflicts	1996-09-24 16:24:12 +00:00
radix.c	- resolve conflicts	1996-09-24 16:24:12 +00:00
radix.h	RCSid Police	1996-10-16 15:41:06 +00:00
rdisc.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00
routed.8	fix 3128 from SAITOH Masanobu.	1997-03-25 19:51:21 +00:00
table.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00
trace.c	- resolve conflicts.	1997-02-03 22:02:51 +00:00