summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/settings.py
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2013-03-18 18:53:31 -0500
committerTim Laszlo <tim.laszlo@gmail.com>2013-03-18 18:53:31 -0500
commitd9780453ff411a45804cdb3fc25964c3f046a4a0 (patch)
tree4d00ff0d286f2bc37d0159faffcdbf561da3e3fa /src/lib/Bcfg2/settings.py
parent4f6ba35fd86ae748d77557936e39db162cc282e3 (diff)
downloadbcfg2-d9780453ff411a45804cdb3fc25964c3f046a4a0.tar.gz
bcfg2-d9780453ff411a45804cdb3fc25964c3f046a4a0.tar.bz2
bcfg2-d9780453ff411a45804cdb3fc25964c3f046a4a0.zip
Revert last change
Diffstat (limited to 'src/lib/Bcfg2/settings.py')
-rw-r--r--src/lib/Bcfg2/settings.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py
index 5300d068f..9e6a815c7 100644
--- a/src/lib/Bcfg2/settings.py
+++ b/src/lib/Bcfg2/settings.py
@@ -27,10 +27,7 @@ DATABASE_PASSWORD = None
DATABASE_HOST = None
DATABASE_PORT = None
-if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] < 2:
- TIME_ZONE = 'America/Chicago'
-else:
- TIME_ZONE = None
+TIME_ZONE = None
DEBUG = False
TEMPLATE_DEBUG = DEBUG