From c4ff04c3576971f255f909ddfaa4beb5bd1bdc39 Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Thu, 14 May 2009 06:39:36 +0100 Subject: [PATCH] [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 --- settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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