[src/trunk]: src/crypto/external/bsd/openssh/dist get rid of an old merge con...

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

details:   https://anonhg.NetBSD.org/src/rev/cea6e31699b7
branches:  trunk
changeset: 771674:cea6e31699b7
user:      agc <agc%NetBSD.org@localhost>
date:      Mon Nov 28 06:36:14 2011 +0000

description:
get rid of an old merge conflict which managed to creep through

diffstat:

 crypto/external/bsd/openssh/dist/ssh-keygen.1 |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r e3711c052038 -r cea6e31699b7 crypto/external/bsd/openssh/dist/ssh-keygen.1
--- a/crypto/external/bsd/openssh/dist/ssh-keygen.1     Mon Nov 28 06:16:40 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-keygen.1     Mon Nov 28 06:36:14 2011 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ssh-keygen.1,v 1.6 2011/09/07 17:49:19 christos Exp $
+.\"    $NetBSD: ssh-keygen.1,v 1.7 2011/11/28 06:36:14 agc Exp $
 .\"    $OpenBSD: ssh-keygen.1,v 1.106 2011/04/13 04:09:37 djm Exp $
 .\"
 .\"  -*- nroff -*-
@@ -410,12 +410,9 @@
 .It Fl q
 Silence
 .Nm ssh-keygen .
-<<<<<<< ssh-keygen.1
 Used by
 .Pa /etc/rc.d/sshd
 when creating a new key.
-=======
->>>>>>> 1.1.1.4
 .It Fl R Ar hostname
 Removes all keys belonging to
 .Ar hostname