Skip to content

E
edx-platform
Commit 1ca6a86c by Alison Hodges
Options

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

Removed rebase error from change log
parents 6fc05bca 3c8c7bb5
Showing with 0 additions and 5 deletions
docs/en_us/course_authors/source/change_log.rst
...@@ -69,12 +69,7 @@ March, 2014 ...@@ -69,12 +69,7 @@ March, 2014
- Updated the :ref:`Adding Pages to a Course` section to reflect feature - Updated the :ref:`Adding Pages to a Course` section to reflect feature
changes. changes.
* - 03/27/14 * - 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.
=======
- 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 * - 03/19/14
- Updated the sections on :ref:`Beta_Testing`, :ref:`Discussions`, - Updated the sections on :ref:`Beta_Testing`, :ref:`Discussions`,
:ref:`Grades`, and :ref:`Student Data` with changes to the new Instructor Dashboard. :ref:`Grades`, and :ref:`Student Data` with changes to the new Instructor Dashboard.
......
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