From c79648de844d194c9b9b2f7aadb68bcee74a9192 Mon Sep 17 00:00:00 2001 From: ru Date: Sat, 3 Jul 2004 22:53:50 +0000 Subject: Merge junk. --- share/man/man9/utopia.9 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9 index f35fca6..170eebc 100644 --- a/share/man/man9/utopia.9 +++ b/share/man/man9/utopia.9 @@ -230,14 +230,9 @@ Twisted pair diagnostic loopback. Diagnostic path loopback. .El .It Va chip -<<<<<<< utopia.9 This points the a function vector for chip specific functions. Two fields -in this vector a publically available: -======= -This points the a function vector for chip specific functions. Two fields -in this vector are publicly available: ->>>>>>> 1.3 +in this vector are publically available: .Bl -tag -width XXX .It Va type This is the type of the detected PHY chip. -- cgit v1.1