diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-14 06:39:36 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-14 06:39:36 +0100 |
| commit | 06487e5534a5334a11f3a7fba62fc714b434f701 (patch) | |
| tree | c66cc131308200fe9c9b9921f00e85a872e8aae4 /settings.py | |
| parent | c0b73d4777fad30b57de96b71656a61ad972eb9d (diff) | |
| download | troggle-06487e5534a5334a11f3a7fba62fc714b434f701.tar.gz troggle-06487e5534a5334a11f3a7fba62fc714b434f701.tar.bz2 troggle-06487e5534a5334a11f3a7fba62fc714b434f701.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.py | 3 |
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 |