Skip to content

E
edx-platform
Commit a1a37f70 by fischerl
Options

fixed previous merge

parent e975d3f2
Showing with 0 additions and 5 deletions
settings_new_askbot.py
...@@ -90,12 +90,7 @@ MIDDLEWARE_CLASSES = ( ...@@ -90,12 +90,7 @@ MIDDLEWARE_CLASSES = (
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'track.middleware.TrackMiddleware', 'track.middleware.TrackMiddleware',
<<<<<<< local
'djangomako.middleware.MakoMiddleware',
'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
=======
'mitxmako.middleware.MakoMiddleware', 'mitxmako.middleware.MakoMiddleware',
>>>>>>> other
#'debug_toolbar.middleware.DebugToolbarMiddleware', #'debug_toolbar.middleware.DebugToolbarMiddleware',
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment