summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/merge_person.html
diff options
context:
space:
mode:
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>