diff options
| author | Derek Anderson <public@kered.org> | 2007-08-06 16:50:17 +0000 |
|---|---|---|
| committer | Derek Anderson <public@kered.org> | 2007-08-06 16:50:17 +0000 |
| commit | 5aa017255827b2c06bd9a5f7f069828ef625da18 (patch) | |
| tree | 22ec9db537e3eeda5c8e21dbfe35f252a97e375d /django/utils/encoding.py | |
| parent | 0af6ed0c4853e11086e277ba352d27db4c466c89 (diff) | |
schema-evolution: update from HEAD (v5821)
git-svn-id: http://code.djangoproject.com/svn/django/branches/schema-evolution@5822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/encoding.py')
| -rw-r--r-- | django/utils/encoding.py | 1 |
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): |