Fix merge conflict and typo in html

This commit is contained in:
Rebecca Law
2017-06-02 16:37:45 +01:00
parent fe24501075
commit 1960a252ea

View File

@@ -36,7 +36,7 @@
{% call row() %}
{{ text_field('Text message sender') }}
{{ text_field(current_service.sms_sender}}
{{ text_field(current_service.sms_sender) }}
{% if current_user.has_permissions([], admin_override=True) or not can_receive_inbound %}
{{ edit_field('Change', url_for('.service_set_sms_sender', service_id=current_service.id, set_inbound_sms=False)) }}
{% else %}