Fix ChangeLog.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129017 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8e4140e..ad4c411 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