[src/trunk]: src/crypto/external/bsd/openssh/dist fix conflict.

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

details:   https://anonhg.NetBSD.org/src/rev/63cda7332c57
branches:  trunk
changeset: 353084:63cda7332c57
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Apr 19 15:34:25 2017 +0000

description:
fix conflict.

diffstat:

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

diffs (21 lines):

diff -r 0a7b4dbed979 -r 63cda7332c57 crypto/external/bsd/openssh/dist/sshd_config
--- a/crypto/external/bsd/openssh/dist/sshd_config      Wed Apr 19 12:58:59 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/sshd_config      Wed Apr 19 15:34:25 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sshd_config,v 1.20 2017/04/18 18:41:46 christos Exp $
+#      $NetBSD: sshd_config,v 1.21 2017/04/19 15:34:25 christos Exp $
 #      $OpenBSD: sshd_config,v 1.101 2017/03/14 07:19:07 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
@@ -74,11 +74,8 @@
 #PrintLastLog yes
 #TCPKeepAlive yes
 #UseLogin no
-<<<<<<< sshd_config
 #UsePrivilegeSeparation sandbox
 UsePam yes
-=======
->>>>>>> 1.1.1.15
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0