diff options
author | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-08-28 15:15:03 +0000 |
---|---|---|
committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-08-28 15:15:03 +0000 |
commit | 7e1cf578732c039eb8282062ee1b0694b8999fd9 (patch) | |
tree | 89a3d25bc8a47448844099059dbe311d68ea7376 /usr.sbin/nsd/nsdc.8.in | |
parent | 0d6801061e70a4e5b4c14fb0f5922c5dbadb8c2d (diff) |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/nsdc.8.in')
-rw-r--r-- | usr.sbin/nsd/nsdc.8.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/nsd/nsdc.8.in b/usr.sbin/nsd/nsdc.8.in index 0efa307ace0..0e4ae4a0b26 100644 --- a/usr.sbin/nsd/nsdc.8.in +++ b/usr.sbin/nsd/nsdc.8.in @@ -1,4 +1,4 @@ -.TH "NSDC" "8" "Jul 9, 2012" "NLnet Labs" "NSDC 3.2.11" +.TH "NSDC" "8" "Jul 27, 2012" "NLnet Labs" "NSDC 3.2.13" .\" Copyright (c) 2001\-2011, NLnet Labs. All rights reserved. .\" See LICENSE for the license. .SH "NAME" |