[src/trunk]: src/external/bsd/blacklist/bin merge conflict

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cfc65b63f2bc
branches:  trunk
changeset: 805989:cfc65b63f2bc
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 26 04:12:46 2015 +0000

description:
merge conflict

diffstat:

 external/bsd/blacklist/bin/blacklistctl.8 |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (24 lines):

diff -r e1b3d7eea949 -r cfc65b63f2bc external/bsd/blacklist/bin/blacklistctl.8
--- a/external/bsd/blacklist/bin/blacklistctl.8 Mon Jan 26 03:57:17 2015 +0000
+++ b/external/bsd/blacklist/bin/blacklistctl.8 Mon Jan 26 04:12:46 2015 +0000
@@ -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 
+.Cm dump
 .Op Fl abdnrw
-=======
-.Cm dump
-.Op Fl abdr
->>>>>>> 1.3
 .Sh DESCRIPTION
 .Nm
 is a program used to display the state of