diff options
| author | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
| commit | 5c1a3647e5e952726219b96156a3eebfa5789118 (patch) | |
| tree | a1a7d61cd30dc7bc80b9778e62052c5eee5e3d67 /contrib/amd/amq/amq.8 | |
| parent | e2c605abd09c68a264a51f01f9362d297976ea63 (diff) | |
| download | FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.zip FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/amd/amq/amq.8')
| -rw-r--r-- | contrib/amd/amq/amq.8 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8 index b7d3c7b..c44f036 100644 --- a/contrib/amd/amq/amq.8 +++ b/contrib/amd/amq/amq.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-1998 Erez Zadok +.\" Copyright (c) 1997-1999 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,8 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amq.8,v 1.3 1998/09/12 04:04:57 obrien Exp $ +.\" $Id: amq.8,v 1.2 1999/01/10 21:53:58 ezk Exp $ +.\" $FreeBSD$ .\" .Dd March 16, 1991 .Dt AMQ 8 |
