Removed evil HEAD line

2014-04-24 18:23:10 -04:00
parent 1e2adc6891
commit 015b1c3abc
1 changed files with 0 additions and 1 deletions
--- 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.