From 95291ef745a990d71990222fbafebf257fbd2c15 Mon Sep 17 00:00:00 2001
From: Brittany Cheng <bcheng42@gmail.com>
Date: Mon, 30 Jul 2012 17:29:07 -0400
Subject: [PATCH] fix line 511

---
 lms/envs/common.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 6b3c734152..ac3e9b8b6e 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -508,7 +508,6 @@ INSTALLED_APPS = (
     'django_comment_client',
 
     # For Askbot
->>>>>>> f82a56d739983e5e36f5bda14ccfd884e094085a
     'django.contrib.sitemaps',
     'django.contrib.admin',
     'django_countries',