Resolve conflicts.
This commit is contained in:
parent
0b96cd80df
commit
2308b50e15
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user