diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-05-09 11:06:39 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-05-09 11:06:39 +0000 |
| commit | 4e9117ed34838632777acfe44b1b4fd118872239 (patch) | |
| tree | 4ba7add85dd4ad8a53545582994fa4a6fbd8440c /example_project/settings.py | |
| parent | 109c24b73e608057159bc96c6e299812b85a41a2 (diff) | |
| parent | 225fc358ccbbae4f546a1d1c698afaeff7dbe2ea (diff) | |
| download | Ishtar-4e9117ed34838632777acfe44b1b4fd118872239.tar.bz2 Ishtar-4e9117ed34838632777acfe44b1b4fd118872239.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' + |