diff options
| -rw-r--r-- | share/man/man4/man4.amiga/ahsc.4 | 6 | ||||
| -rw-r--r-- | share/man/man4/man4.amiga/gtsc.4 | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/share/man/man4/man4.amiga/ahsc.4 b/share/man/man4/man4.amiga/ahsc.4 index 5c6463c80a8..278b840cd6f 100644 --- a/share/man/man4/man4.amiga/ahsc.4 +++ b/share/man/man4/man4.amiga/ahsc.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ahsc.4,v 1.7 2001/06/23 07:04:11 pjanzen Exp $ +.\" $OpenBSD: ahsc.4,v 1.8 2001/09/07 15:05:41 mpech Exp $ .\" .\" Copyright (c) 1994 Christian E. Hopps .\" All rights reserved. @@ -69,11 +69,7 @@ withing the SCSI chip. .It ahsc%d: abort %s: csr = 0x%02x, asr = 0x%02x A SCSI operation %s was aborted due to an error. .It ahsc%d: csr == 0x%02i -<<<<<<< ahsc.4 -A error has occurred within the SCSI chip code. -======= An error has occurred within the SCSI chip code. ->>>>>>> 1.3 .It ahsc%d: unexpected phase %d in icmd from %d The target described by .Sq from %d diff --git a/share/man/man4/man4.amiga/gtsc.4 b/share/man/man4/man4.amiga/gtsc.4 index aa3889a8a13..d7e640e7468 100644 --- a/share/man/man4/man4.amiga/gtsc.4 +++ b/share/man/man4/man4.amiga/gtsc.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: gtsc.4,v 1.7 2001/06/23 07:04:11 pjanzen Exp $ +.\" $OpenBSD: gtsc.4,v 1.8 2001/09/07 15:05:41 mpech Exp $ .\" .\" Copyright (c) 1994 Christian E. Hopps .\" All rights reserved. @@ -69,11 +69,7 @@ withing the SCSI chip. .It gtsc%d: abort %s: csr = 0x%02x, asr = 0x%02x A SCSI operation %s was aborted due to an error. .It gtsc%d: csr == 0x%02i -<<<<<<< gtsc.4 -A error has occurred within the SCSI chip code. -======= An error has occurred within the SCSI chip code. ->>>>>>> 1.3 .It gtsc%d: unexpected phase %d in icmd from %d The target described by .Sq from %d |