merge conflict resolved

This commit is contained in:
Arvind Tiwari 2017-08-31 23:47:42 +05:30
commit d0e770d0df
4 changed files with 15 additions and 216 deletions

View file

@ -40,7 +40,7 @@
{% endif %}
</td>
<td class="text-right last-td">
<a class="btn btn-order-detail alt-text" href="{% url 'hosting:orders' order.pk %}" data-alt="{% trans 'See Invoice' %}">{% trans "View Detail" %}</a>
<a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a>
</td>
</tr>
{% endfor %}