Skip to content

E
edx-platform
Commit 402c3f32 by Chris Rodriguez
Options

Removing conflict from header

parent 4fd1ebce
Showing with 0 additions and 3 deletions
lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
...@@ -4,10 +4,7 @@ ...@@ -4,10 +4,7 @@
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<<<<<<< Updated upstream
=======
<%block name="bodyclass">view-incourse view-instructordash</%block> <%block name="bodyclass">view-incourse view-instructordash</%block>
>>>>>>> Stashed changes
## ----- Tips on adding something to the new instructor dashboard ----- ## ----- Tips on adding something to the new instructor dashboard -----
## 1. add your input element, e.g. in instructor_dashboard2/data_download.html ## 1. add your input element, e.g. in instructor_dashboard2/data_download.html
......
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