Fix ChangeLog.

From-SVN: r129017

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8e4140eb065c84f046f014a8ed9e7ca6b12f2a35..ad4c411c2a757093121a0ee9981a72e0c6e4f6ac 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,11 +1,9 @@
-<<<<<<< .mine
 2007-10-04  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libfortran/33253
        * io/list_read.c (read_character): Use line_buffer to scan ahead for
        object name or string when no delimiter is found.
 
-=======
 2007-10-04  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        PR libfortran/32021
@@ -18,7 +16,6 @@
        fpu_precision, sighup, sigint, allocate_init_flag and
        allocate_init_value.
 
->>>>>>> .r129015
 2007-10-02  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libfortran/33253