summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/merge_organization.html
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-18 13:40:28 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-18 13:40:28 +0200
commitf4d6be02a756865b951d94fa8e9cd5866dcea7de (patch)
tree70af59e9247ecda036f585343f85f9086430f426 /ishtar_common/templates/ishtar/merge_organization.html
parentc498f5da00e3d85e10b7dd755bcbda89de511962 (diff)
downloadIshtar-f4d6be02a756865b951d94fa8e9cd5866dcea7de.tar.bz2
Ishtar-f4d6be02a756865b951d94fa8e9cd5866dcea7de.zip
Django 1.8: removing "load url from future" we are in the future
Diffstat (limited to 'ishtar_common/templates/ishtar/merge_organization.html')
-rw-r--r--ishtar_common/templates/ishtar/merge_organization.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html
index 87eab7d53..10730e8c5 100644
--- a/ishtar_common/templates/ishtar/merge_organization.html
+++ b/ishtar_common/templates/ishtar/merge_organization.html
@@ -1,5 +1,4 @@
{% extends "ishtar/merge.html" %}
-{% load url from future %}
{% block merge_field_row %}
{% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %}
<tr>