Remove leftover merge garbage

2012-10-23 13:40:34 -04:00
parent b52ed48221
commit ef1ba6d9f7
1 changed files with 0 additions and 6 deletions
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -338,12 +338,6 @@ TEMPLATE_LOADERS = (

    # 'django.template.loaders.filesystem.Loader',
    # 'django.template.loaders.app_directories.Loader',
-<<<<<<< HEAD
-    
-=======
-
-    #'askbot.skins.loaders.filesystem_load_template_source',
->>>>>>> origin/master
    # 'django.template.loaders.eggs.Loader',
 )