[src/trunk]: src/share/man/man4 Remove some crap that looks like it came from...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a2ca4580bbf7
branches:  trunk
changeset: 487740:a2ca4580bbf7
user:      ad <ad%NetBSD.org@localhost>
date:      Mon Jun 12 11:11:19 2000 +0000

description:
Remove some crap that looks like it came from a conflict.

diffstat:

 share/man/man4/wdc.4 |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 1e82cac47cff -r a2ca4580bbf7 share/man/man4/wdc.4
--- a/share/man/man4/wdc.4      Mon Jun 12 11:07:45 2000 +0000
+++ b/share/man/man4/wdc.4      Mon Jun 12 11:11:19 2000 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: wdc.4,v 1.9 2000/05/15 06:33:22 bouyer Exp $
+.\"    $NetBSD: wdc.4,v 1.10 2000/06/12 11:11:19 ad Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
 .\"
@@ -59,7 +59,6 @@
 and ESDI on the ISA bus. PCI IDE controllers in legacy mode are also supported,
 but the
 .Xr pciide 4
-<<<<<<< wdc.4
 driver may provide more functionaliy.
 .Pp
 For the ISA front-end, the 0x01 flag enables 32-bit I/O negotiation in