Skip to content

E
edx-platform
Commit ef1ba6d9 by Calen Pennington
Options

Remove leftover merge garbage

parent b52ed482
Showing with 0 additions and 6 deletions
lms/envs/common.py
...@@ -338,12 +338,6 @@ TEMPLATE_LOADERS = ( ...@@ -338,12 +338,6 @@ TEMPLATE_LOADERS = (
# 'django.template.loaders.filesystem.Loader', # 'django.template.loaders.filesystem.Loader',
# 'django.template.loaders.app_directories.Loader', # 'django.template.loaders.app_directories.Loader',
<<<<<<< HEAD
=======
#'askbot.skins.loaders.filesystem_load_template_source',
>>>>>>> origin/master
# 'django.template.loaders.eggs.Loader', # 'django.template.loaders.eggs.Loader',
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment