Reslove conflicts

Signed-off-by: Khanh Ngo <khanh.ngo@taxfix.de>
This commit is contained in:
Khanh Ngo
2021-10-30 21:15:04 +02:00
4 changed files with 8 additions and 2 deletions

View File

@ -644,7 +644,7 @@ def setting_basic():
'pretty_ipv6_ptr', 'dnssec_admins_only',
'allow_user_create_domain', 'allow_user_view_history', 'bg_domain_updates', 'site_name',
'session_timeout', 'warn_session_timeout', 'ttl_options',
'pdns_api_timeout', 'verify_ssl_connections', 'verify_user_email', 'otp_field_enabled'
'pdns_api_timeout', 'verify_ssl_connections', 'verify_user_email', 'otp_field_enabled', 'custom_css'
]
return render_template('admin_setting_basic.html', settings=settings)