Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix merge conflict"

Browse Source 
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
This commit is contained in:
Diana Huang
2013-04-26 12:40:35 -04:00
parent 5560a4add4
commit 2df3fe9344
30 changed files with 87 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/templates/discussion/single_thread.html
View File

@@ -23,7 +23,7 @@
<%include file="_new_post.html" />
<section class="discussion container" id="discussion-container" data-roles="${roles}" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}" data-content-info="${annotated_content_info}" data-thread-pages="${thread_pages}" data-flag-moderator="${flag_moderator}">
<section class="discussion container" id="discussion-container" data-roles="${roles}" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}" data-content-info="${annotated_content_info}" data-thread-pages="${thread_pages}">
<div class="discussion-body">
<div class="sidebar"></div>
<div class="discussion-column"></div>