Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
christos 2015-01-26 04:12:46 +00:00
parent 6399d84e46
commit 8d2f2f5d56
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/bsd/blacklist/bin/blacklistctl.8 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: blacklistctl.8,v 1.4 2015/01/26 02:31:52 christos Exp $
.\" $NetBSD: blacklistctl.8,v 1.5 2015/01/26 04:12:46 christos Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -35,13 +35,8 @@
.Nd display and change the state of blacklistd
.Sh SYNOPSIS
.Nm
<<<<<<< blacklistctl.8
dump
.Op Fl abdnrw
=======
.Cm dump
.Op Fl abdr
>>>>>>> 1.3
.Op Fl abdnrw
.Sh DESCRIPTION
.Nm
is a program used to display the state of