From 9f663ff72d99fbcddf7d5f0753eb311ab859847b Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Sun, 28 Oct 2012 17:30:22 +0200 Subject: [PATCH] Resolve conflict after merge --- snf-astakos-app/astakos/im/synnefo_settings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/snf-astakos-app/astakos/im/synnefo_settings.py b/snf-astakos-app/astakos/im/synnefo_settings.py index c97a173..f92aabc 100644 --- a/snf-astakos-app/astakos/im/synnefo_settings.py +++ b/snf-astakos-app/astakos/im/synnefo_settings.py @@ -44,7 +44,8 @@ installed_apps = [ 'django.contrib.sessions', 'django.contrib.messages', 'djcelery', - 'debug_toolbar',] +# 'debug_toolbar' + ] context_processors = [ 'django.core.context_processors.media', @@ -67,7 +68,7 @@ middlware_classes = [ 'synnefo.lib.middleware.LoggingConfigMiddleware', 'synnefo.lib.middleware.SecureMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', - 'debug_toolbar.middleware.DebugToolbarMiddleware', +# 'debug_toolbar.middleware.DebugToolbarMiddleware' ] loggers = { -- 1.7.10.4