David E. O'Brien 09f86e4760 Fix conflicts.		1999-06-22 19:19:46 +00:00
..
if_xe.c	Fix conflicts.	1999-06-22 19:19:46 +00:00
if_xereg.h	Fix conflicts.	1999-06-22 19:19:46 +00:00