From e32095616c50bef9b06dc8637a99584ba947bae5 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Mon, 23 Dec 2013 16:01:13 +0100
Subject: Imported override_settings from its new location.

---
 tests/admin_docs/tests.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/admin_docs')

diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py
index 9f5ace0360..d2f8386bdb 100644
--- a/tests/admin_docs/tests.py
+++ b/tests/admin_docs/tests.py
@@ -5,8 +5,7 @@ from django.contrib.sites.models import Site
 from django.contrib.admindocs import utils
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
-from django.test import TestCase
-from django.test.utils import modify_settings, override_settings
+from django.test import TestCase, modify_settings, override_settings
 
 
 class MiscTests(TestCase):
-- 
cgit v1.3