Revert overly aggressive killing.

(don't worry--askbot is still dead)

Revert overly aggressive killing.
(don't worry--askbot is still dead)
60368ec3 · Victor Shnayder · Don Mitchell · 956b7047 · 60368ec3
Commit 60368ec3 authored Oct 30, 2012 by Victor Shnayder Committed by Don Mitchell Nov 19, 2012
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lms/envs/common.py
+0 -3

No files found.
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -359,10 +359,7 @@ MIDDLEWARE_CLASSES = (

    'course_wiki.course_nav.Middleware',

-<<<<<<< HEAD
    'django.middleware.transaction.TransactionMiddleware',
-=======
->>>>>>> remove (almost) all references to askbot.
    # 'debug_toolbar.middleware.DebugToolbarMiddleware',

    'django_comment_client.utils.ViewNameMiddleware',