From 3c8c7bb5fdadd6a3cfbd959b04a2aceb6aa3fe10 Mon Sep 17 00:00:00 2001 From: Alison Hodges Date: Tue, 22 Apr 2014 16:40:32 -0400 Subject: [PATCH] Removed rebase error from change log --- docs/en_us/course_authors/source/change_log.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/en_us/course_authors/source/change_log.rst b/docs/en_us/course_authors/source/change_log.rst index 5f83a2811e..31f16cd6fc 100644 --- a/docs/en_us/course_authors/source/change_log.rst +++ b/docs/en_us/course_authors/source/change_log.rst @@ -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.