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.
