[fix] Remove rebase conflict blank line

This commit is contained in:
ljf 2020-12-03 18:27:09 +01:00
parent cd5798763c
commit 95eea93c4a
2 changed files with 1 additions and 1 deletions

View file

@ -25,7 +25,6 @@ do_pre_regen() {
# Support different strategy for security configurations
export compatibility="$(yunohost settings get 'security.ssh.compatibility')"
export ssh_keys
export ipv6_enabled
ynh_render_template "sshd_config" "${pending_dir}/etc/ssh/sshd_config"

View file

@ -91,6 +91,7 @@ PermitTunnel no
# Disable .ssh/rc, which could be edited (e.g. from Nextcloud or whatever) by users to execute arbitrary commands even if SSH login is disabled
PermitUserRC no
# root login is allowed on local networks
# It's meant to be a backup solution in case LDAP is down and
# user admin can't be used...