Skip to content
Snippets Groups Projects
Commit ef1ba6d9 authored by Calen Pennington's avatar Calen Pennington
Browse files

Remove leftover merge garbage

parent b52ed482
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 6 deletions
lms/envs/common.py
+ 0
− 6
View file @ ef1ba6d9
......@@ -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',
)
......
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