summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/merge.html
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/templates/ishtar/merge.html')
-rw-r--r--ishtar_common/templates/ishtar/merge.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html
index 0e15da62a..de46e95c6 100644
--- a/ishtar_common/templates/ishtar/merge.html
+++ b/ishtar_common/templates/ishtar/merge.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load url from future %}
{% load i18n inline_formset %}
{% block content %}
<h2>{% trans "Merge" %}</h2>