Module Name: src
Committed By: christos
Date: Mon Jan 26 04:12:46 UTC 2015
Modified Files:
src/external/bsd/blacklist/bin: blacklistctl.8
Log Message:
merge conflict
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/blacklist/bin/blacklistctl.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blacklist/bin/blacklistctl.8
diff -u src/external/bsd/blacklist/bin/blacklistctl.8:1.4 src/external/bsd/blacklist/bin/blacklistctl.8:1.5
--- src/external/bsd/blacklist/bin/blacklistctl.8:1.4 Sun Jan 25 21:31:52 2015
+++ src/external/bsd/blacklist/bin/blacklistctl.8 Sun Jan 25 23:12:46 2015
@@ -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
