diff options
| author | delphij <delphij@FreeBSD.org> | 2008-04-21 18:31:50 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2008-04-21 18:31:50 +0000 |
| commit | a2049366d7831763f8233a1c0da9b6aeb757d880 (patch) | |
| tree | 5212d0577c598e7b7c583d7802bfa2bd5e074332 /contrib/netcat | |
| parent | 25a943c6dfe3643776122f41adf40863b7906f36 (diff) | |
| download | FreeBSD-src-a2049366d7831763f8233a1c0da9b6aeb757d880.zip FreeBSD-src-a2049366d7831763f8233a1c0da9b6aeb757d880.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/netcat')
| -rw-r--r-- | contrib/netcat/nc.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1 index b7f5756..b4f4ab9 100644 --- a/contrib/netcat/nc.1 +++ b/contrib/netcat/nc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.44 2006/12/02 01:08:30 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 2, 2008 +.Dd $Mdocdate$ .Dt NC 1 .Os .Sh NAME |
