Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed previous merge

Browse Source
This commit is contained in:
fischerl
2012-01-29 17:19:07 -05:00
parent e975d3f2f9
commit a1a37f700d
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
settings_new_askbot.py
View File

@@ -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',
) )