From 04bf5fc094674b5f60be8befb16ed6c306ac52b4 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Thu, 6 Sep 2018 10:15:15 +0200 Subject: [PATCH] fixed merge error --- src/documents/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/documents/admin.py b/src/documents/admin.py index aae373bc7..3acf58362 100755 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -4,12 +4,13 @@ from django.conf import settings from django.contrib import admin, messages from django.contrib.admin.templatetags.admin_urls import add_preserved_filters from django.contrib.auth.models import User, Group +from django.http import HttpResponseRedirect try: from django.core.urlresolvers import reverse except ImportError: from django.urls import reverse from django.templatetags.static import static -from django.utils.html import format_html +from django.utils.html import format_html, format_html_join from django.utils.http import urlquote from django.utils.safestring import mark_safe from django.db import models