Fix bad merge

diff --git a/app/settings.py b/app/settings.py
index e0d5a2b530e2d4f02c9b195d10f47af7591161f8..085f218e68d7808c28de357d5e23db2606355543 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -192,54 +192,6 @@ TEMPLATE_LOADERS = (
     )),
 )
 
-MIDDLEWARE = (('debug_toolbar.middleware.DebugToolbarMiddleware',) if DEBUG_TOOLBAR else ()) + (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'dj_pagination.middleware.PaginationMiddleware',
-    'teleforma.middleware.XsSharing',
-    'django_user_agents.middleware.UserAgentMiddleware',
-)
-
-ROOT_URLCONF = 'urls'
-
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'teleforma',
-    'jazzmin',
-    'django.contrib.admin',
-    'channels',
-    'teleforma.webclass',
-    'teleforma.exam',
-    'jsonrpc',
-    'sorl.thumbnail',
-    'dj_pagination',
-    'postman',
-    'captcha',
-    'django_nvd3',
-    'tinymce',
-    'pdfannotator',
-    'quiz',
-    'multichoice',
-    'true_false',
-    'essay',
-    'rest_framework',
-    'rest_framework.authtoken',
-)
-
-
-if DEBUG_TOOLBAR:
-    INSTALLED_APPS += ('debug_toolbar',)
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -380,6 +332,10 @@ INSTALLED_APPS = (
     'django_nvd3',
     'tinymce',
     'pdfannotator',
+    'quiz',
+    'multichoice',
+    'true_false',
+    'essay',
     'rest_framework',
     'rest_framework.authtoken',
     'storages',