summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/merge_person.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
commite9816cb2d3ddc4530303a532210cc12782922c83 (patch)
tree70af59e9247ecda036f585343f85f9086430f426 /ishtar_common/templates/ishtar/merge_person.html
parentb761775288d21112b18f60bf91fef083458b57fe (diff)
downloadIshtar-e9816cb2d3ddc4530303a532210cc12782922c83.tar.bz2
Ishtar-e9816cb2d3ddc4530303a532210cc12782922c83.zip
Django 1.8: removing "load url from future" we are in the future
Diffstat (limited to 'ishtar_common/templates/ishtar/merge_person.html')
-rw-r--r--ishtar_common/templates/ishtar/merge_person.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html
index 4e76c804b..0d03112c5 100644
--- a/ishtar_common/templates/ishtar/merge_person.html
+++ b/ishtar_common/templates/ishtar/merge_person.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>