Skip to content

E
edx-platform
Commit 0dea8326 by Joe Blaylock
Options

Fix bad merge commit

parent 290e8641
Showing with 1 additions and 1 deletions
lms/envs/common.py
...@@ -287,7 +287,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ...@@ -287,7 +287,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'mitxmako.shortcuts.marketing_link_context_processor', 'mitxmako.shortcuts.marketing_link_context_processor',
# Include TEMPLATE_VISIBLE_SETTINGS in templates # Include TEMPLATE_VISIBLE_SETTINGS in templates
'settings_context_processor.context_processors.settings' 'settings_context_processor.context_processors.settings',
# Shoppingcart processor (detects if request.user has a cart) # Shoppingcart processor (detects if request.user has a cart)
'shoppingcart.context_processor.user_has_cart_context_processor', 'shoppingcart.context_processor.user_has_cart_context_processor',
......
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