Module Name: src
Committed By: christos
Date: Wed Apr 19 15:34:25 UTC 2017
Modified Files:
src/crypto/external/bsd/openssh/dist: sshd_config
Log Message:
fix conflict.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/sshd_config
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/sshd_config
diff -u src/crypto/external/bsd/openssh/dist/sshd_config:1.20 src/crypto/external/bsd/openssh/dist/sshd_config:1.21
--- src/crypto/external/bsd/openssh/dist/sshd_config:1.20 Tue Apr 18 14:41:46 2017
+++ src/crypto/external/bsd/openssh/dist/sshd_config Wed Apr 19 11:34:25 2017
@@ -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 @@ AuthorizedKeysFile .ssh/authorized_keys
#PrintLastLog yes
#TCPKeepAlive yes
#UseLogin no
-<<<<<<< sshd_config
#UsePrivilegeSeparation sandbox
UsePam yes
-=======
->>>>>>> 1.1.1.15
#PermitUserEnvironment no
#Compression delayed
#ClientAliveInterval 0
