fix line 511

2012-07-30 17:29:07 -04:00
parent 2ad854abb7
commit 95291ef745
1 changed files with 0 additions and 1 deletions
--- 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',