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/modeladmin/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/modeladmin')

diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py
index 38bfcc25dd..0c7a115fef 100644
--- a/tests/modeladmin/tests.py
+++ b/tests/modeladmin/tests.py
@@ -13,8 +13,8 @@ from django.contrib.admin import (SimpleListFilter,
 from django.core.exceptions import ImproperlyConfigured
 from django.forms.models import BaseModelFormSet
 from django.forms.widgets import Select
-from django.test import TestCase
-from django.test.utils import str_prefix, override_settings
+from django.test import TestCase, override_settings
+from django.test.utils import str_prefix
 from django.utils import six
 
 from .models import Band, Concert, ValidationTestModel, ValidationTestInlineModel
-- 
cgit v1.3