[settings] : resolving conflicts

diff --cc app/local_settings.py
index dc7bd78de912ca3f4b73351450813a045c956e5f,a1f6bc03db73a7c6df152238d2f5c13b4ca8f64d..b7944d03f2ab75261a64ead5b0e80492737b3856
--- 1/app/local_settings.py
--- 2/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'),
- # ]