resolve merge conflicts

This commit is contained in:
Adam Shimali
2016-01-12 10:43:23 +00:00
45 changed files with 448 additions and 231 deletions

View File

@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/sms-message.html" import sms_message %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form-field.html" import render_field %}
{% from "components/textbox.html" import textbox %}
{% block page_title %}
GOV.UK Notify | Send text messages
@@ -38,7 +38,7 @@
You can also <a href="#">download an example CSV</a>.
</p>
<p>
{{render_field(form.file)}}
{{textbox(form.file)}}
</p>
{{ page_footer("Continue") }}