From fed2a4733b7b0aea5a23923509518acbe72e709b Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Thu, 4 Oct 2007 15:59:54 +0000 Subject: Fix ChangeLog. From-SVN: r129017 --- libgfortran/ChangeLog | 3 --- 1 file changed, 3 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 8e4140e..ad4c411 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,11 +1,9 @@ -<<<<<<< .mine 2007-10-04 Jerry DeLisle 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 PR libfortran/32021 @@ -18,7 +16,6 @@ fpu_precision, sighup, sigint, allocate_init_flag and allocate_init_value. ->>>>>>> .r129015 2007-10-02 Jerry DeLisle PR libfortran/33253 -- cgit v1.1