fix line 511

95291ef7 · Brittany Cheng · 2ad854ab · 95291ef7
Commit 95291ef7 authored Jul 30, 2012 by Brittany Cheng
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

lms/envs/common.py
+0 -1

No files found.
--- 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',