Skip to content

E
edx-platform
Commit b199a72c by Adam Palay
Options

Merge remote-tracking branch 'origin/release' into merge-release-into-master 

Conflicts:
	cms/djangoapps/contentstore/views/course.py
parents 83fce4d6 21e338f7
Showing with 0 additions and 1 deletions
cms/djangoapps/contentstore/views/course.py
...@@ -1032,7 +1032,6 @@ def _refresh_course_tabs(request, course_module): ...@@ -1032,7 +1032,6 @@ def _refresh_course_tabs(request, course_module):
""" """
tab_panel = { tab_panel = {
"type": tab_type.type, "type": tab_type.type,
"name": tab_type.title,
} }
has_tab = tab_panel in tabs has_tab = tab_panel in tabs
if tab_enabled and not has_tab: if tab_enabled and not has_tab:
......
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