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

Merge pull request #3433 from edx/ahodges/documentation/changelog

Browse Source 
Removed rebase error from change log
This commit is contained in:
Alison Hodges
2014-04-22 16:41:02 -04:00
parent 6fc05bcacf 3c8c7bb5fd
commit 1ca6a86c79
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/en_us/course_authors/source/change_log.rst
View File

@@ -69,12 +69,7 @@ March, 2014
- Updated the :ref:`Adding Pages to a Course` section to reflect feature
changes.
* - 03/27/14
<<<<<<< HEAD
- Updated the section on :ref:`Beta_Testing` to include the new "batch add" feature.
=======
- Updated the section on :ref:`Beta_Testing` to include the new "batch add"
feature.
>>>>>>> doc for LMS-2525: feature changes for student enrollment
* - 03/19/14
- Updated the sections on :ref:`Beta_Testing`, :ref:`Discussions`,
:ref:`Grades`, and :ref:`Student Data` with changes to the new Instructor Dashboard.