Removed evil HEAD line

015b1c3a · Alison Hodges · 1e2adc68 · 015b1c3a
Commit 015b1c3a authored Apr 24, 2014 by Alison Hodges
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

docs/en_us/course_authors/source/change_log.rst
+0 -1

No files found.
--- a/docs/en_us/course_authors/source/change_log.rst
+++ b/docs/en_us/course_authors/source/change_log.rst
@@ -11,7 +11,6 @@ April, 2014
   :header-rows: 1

   * - Date
-<<<<<<< HEAD
     - Change  
   * - 04/24/14
     - Expanded the :ref:`Grades` chapter to include topics on interpreting the grade reports and student progress page.