From 60368ec37024e2ee2fff2930ce5fe3cbfcebf4dc Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Tue, 30 Oct 2012 20:49:10 -0400
Subject: [PATCH] Revert overly aggressive killing.

(don't worry--askbot is still dead)
---
 lms/envs/common.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 9654031e95..85918c7c33 100644
--- 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',