diff options
author | Tim Laszlo <tim.laszlo@gmail.com> | 2013-03-18 18:53:31 -0500 |
---|---|---|
committer | Tim Laszlo <tim.laszlo@gmail.com> | 2013-03-18 18:59:32 -0500 |
commit | 42da463a21387ba24de572e9cccd1e2fed1e135e (patch) | |
tree | 4d00ff0d286f2bc37d0159faffcdbf561da3e3fa /src/lib/Bcfg2 | |
parent | aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f (diff) | |
download | bcfg2-42da463a21387ba24de572e9cccd1e2fed1e135e.tar.gz bcfg2-42da463a21387ba24de572e9cccd1e2fed1e135e.tar.bz2 bcfg2-42da463a21387ba24de572e9cccd1e2fed1e135e.zip |
Revert last change
(cherry picked from commit d9780453ff411a45804cdb3fc25964c3f046a4a0)
Diffstat (limited to 'src/lib/Bcfg2')
-rw-r--r-- | src/lib/Bcfg2/settings.py | 5 |
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 |