diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b3d179910ccac2265fe62cd215b081517d9449c5..d4eae5e593c588b5a294d12afdca25c3a753beae 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2009-01-14 Steven G. Kargl <kargl@gcc.gnu.org> + + * ChangeLog-2007: Clean out svn merge droppings. + 2009-01-10 Paul Thomas <pault@gcc.gnu.org> PR fortran/38763 diff --git a/gcc/fortran/ChangeLog-2007 b/gcc/fortran/ChangeLog-2007 index 9c34c79ca0240c57ad8799faef2218f45ac73124..4597cb58fd3bb2f94ac638bf580e7de20b6b3109 100644 --- a/gcc/fortran/ChangeLog-2007 +++ b/gcc/fortran/ChangeLog-2007 @@ -87,7 +87,6 @@ * module.c (read_module): Check sym->module is there before using it in a string comparison. ->>>>>>> .r131138 2007-12-20 Tobias Burnus <burnus@net-b.de> PR fortran/34482