From: Emilie <zawadzki@ircam.fr>
Date: Fri, 22 Dec 2017 11:13:56 +0000 (+0100)
Subject: [settings] : resolving conflicts
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9f56b73d7ad8ea1ce8e5e24198db398109bec661;p=mezzo.git

[settings] : resolving conflicts
---

9f56b73d7ad8ea1ce8e5e24198db398109bec661
diff --cc app/local_settings.py
index dc7bd78d,a1f6bc03..b7944d03
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@@ -69,12 -67,4 +67,5 @@@ DEFAULT_FROM_EMAIL = 'default@default.o
  DEFAULT_TO_EMAIL = 'recipient@recipient.org' # default recipient, for your tests
  EMAIL_SUBJECT_PREFIX = "[PREFIX]" # prefix title in email
  SITE_TITLE = 'Your Site'
 -SITE_TAGLINE = 'This is a Mezzo site'
 +SITE_TAGLINE = 'This is a Mezzo site'
 +
- 
- # HOST_THEMES = [
- #     ('manifeste.ircam.fr', 'themes.base'),
- #     ('vertigo.ircam.fr', 'organization_themes.vertigo-themes.vertigo_ircam_fr'),
- #     ('vertigo.starts.eu', 'organization_themes.vertigo-themes.vertigo_starts_eu'),
- #     ('www.starts.eu', 'organization_themes.vertigo-themes.www_starts_eu'),
- # ]