fixed previous merge

2012-01-29 17:19:07 -05:00
parent e975d3f2f9
commit a1a37f700d
1 changed files with 0 additions and 5 deletions
--- a/settings_new_askbot.py
+++ b/settings_new_askbot.py
@@ -90,12 +90,7 @@ MIDDLEWARE_CLASSES = (
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'track.middleware.TrackMiddleware',
-<<<<<<< local
-    'djangomako.middleware.MakoMiddleware',
-    'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
-=======
    'mitxmako.middleware.MakoMiddleware',
->>>>>>> other
    #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )