diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 1999-07-08 01:26:49 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 1999-07-08 01:26:49 +0000 |
| commit | be1911ee77fa5dbc5f7f3d3c8d2b53aca76042fe (patch) | |
| tree | 0aa81e091418cad8562e7d30a102481ab9747cfe /share/man | |
| parent | 0ba9bc0e342f272ae2b9f6675d3dbb5571a9af76 (diff) | |
whoops, a conflicting merge; pjanzen@
Diffstat (limited to 'share/man')
| -rw-r--r-- | share/man/man4/man4.amiga/atzsc.4 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/share/man/man4/man4.amiga/atzsc.4 b/share/man/man4/man4.amiga/atzsc.4 index db49b15a8c6..2f6e56a572e 100644 --- a/share/man/man4/man4.amiga/atzsc.4 +++ b/share/man/man4/man4.amiga/atzsc.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: atzsc.4,v 1.4 1999/07/07 10:50:10 aaron Exp $ +.\" $OpenBSD: atzsc.4,v 1.5 1999/07/08 01:26:48 aaron Exp $ .\" .\" Copyright (c) 1994 Christian E. Hopps .\" All rights reserved. @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: atzsc.4,v 1.4 1999/07/07 10:50:10 aaron Exp $ +.\" $Id: atzsc.4,v 1.5 1999/07/08 01:26:48 aaron Exp $ .\" .Dd August 31, 1994 .Dt ATZSC 4 amiga @@ -78,11 +78,7 @@ withing the SCSI chip. .It atzsc%d: abort %s: csr = 0x%02x, asr = 0x%02x A SCSI operation %s was aborted due to an error. .It atzsc%d: csr == 0x%02i -<<<<<<< atzsc.4 -A error has occurred within the SCSI chip code. -======= An error has occurred within the SCSI chip code. ->>>>>>> 1.3 .It atzsc%d: unexpected phase %d in icmd from %d The target described by .Sq from %d |