summaryrefslogtreecommitdiffstats
path: root/settings.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-14 06:39:36 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-14 06:39:36 +0100
commitc4ff04c3576971f255f909ddfaa4beb5bd1bdc39 (patch)
tree186cbe30c1ad209e45dc1135373ad174ebfb6a52 /settings.py
parentb1cc5ce6b561019b7b5a1039587e3794e094e5a4 (diff)
downloadtroggle-c4ff04c3576971f255f909ddfaa4beb5bd1bdc39.tar.gz
troggle-c4ff04c3576971f255f909ddfaa4beb5bd1bdc39.tar.bz2
troggle-c4ff04c3576971f255f909ddfaa4beb5bd1bdc39.zip
[svn] localsettings should override settings, so the import should be at the bottom of the file, unless someone has a better way of doing this
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/settings.py b/settings.py
index 4a6fa34..6b878ee 100644
--- a/settings.py
+++ b/settings.py
@@ -1,4 +1,3 @@
-from localsettings import *
import os
import urlparse
# Django settings for troggle project.
@@ -88,3 +87,5 @@ INSTALLED_APPS = (
'troggle.expo',
'troggle.imagekit',
)
+
+from localsettings import * \ No newline at end of file