Remove leftover merge garbage

ef1ba6d9 · Calen Pennington · b52ed482 · ef1ba6d9
Commit ef1ba6d9 authored Oct 23, 2012 by Calen Pennington
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

lms/envs/common.py
+0 -6

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