summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 7515d0c41b..2319496538 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -1,6 +1,5 @@
import types
import urllib
-from django.conf import settings
from django.utils.functional import Promise
class StrAndUnicode(object):