summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--example_project/settings.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4c38aae39..4b58376e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.mo
*~
.~*
+drassm_app/*
django-simple-history/*
django-formwizard/*
ishtar-docs
diff --git a/example_project/settings.py b/example_project/settings.py
index 241e330f9..db9a3ee64 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -162,6 +162,8 @@ INSTALLED_APPS = [
# 'debug_toolbar',
]
+MAIN_APP = ""
+
LOGFILE = ''
default_handler = {
@@ -263,6 +265,9 @@ try:
except ImportError, e:
print('Unable to load local_settings.py:', e)
+if MAIN_APP:
+ INSTALLED_APPS.insert(INSTALLED_APPS.index("ishtar_common"), MAIN_APP)
+
TESTING = sys.argv[1:2] == ['test']
PROJECT_SLUG = locals().get('PROJECT_SLUG', 'default')