diff options
| author | root <root@viserion.(none)> | 2013-05-09 11:06:39 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-05-09 11:06:39 +0000 |
| commit | 1b46198250824c2c53c59d3ebaa069346a1f0b03 (patch) | |
| tree | 4ba7add85dd4ad8a53545582994fa4a6fbd8440c /example_project/settings.py | |
| parent | 8b3f35c4f3ff05c9426b3b4f83f2a3113d7add83 (diff) | |
| parent | a9eaaadd6bdd912f1610b83047fb4f457cac5cf6 (diff) | |
| download | Ishtar-1b46198250824c2c53c59d3ebaa069346a1f0b03.tar.bz2 Ishtar-1b46198250824c2c53c59d3ebaa069346a1f0b03.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index bfb59fb5d..bb7a59d74 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -102,7 +102,7 @@ INSTALLED_APPS = [ 'django.contrib.formtools', 'south', 'registration', - 'geodjangofla', + #'geodjangofla', 'ishtar_common', 'archaeological_operations', # mandatory app to run ishtar #'django_extensions', @@ -196,3 +196,4 @@ DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS':False} import sys if 'test' in sys.argv or 'test_coverage' in sys.argv: DATABASES['default']['engine'] = 'sqlite3' + |