ChangeLog-2007: Clean out svn merge droppings.

2009-01-14 Steven G. Kargl <kargl@gcc.gnu.org> * ChangeLog-2007: Clean out svn merge droppings. From-SVN: r143385

ChangeLog-2007: Clean out svn merge droppings.
2009-01-14 Steven G. Kargl <kargl@gcc.gnu.org> * ChangeLog-2007: Clean out svn merge droppings. From-SVN: r143385
3e55cc6f · Steven G. Kargl · 765ec70c · 3e55cc6f · 3e55cc6f
Commit 3e55cc6f authored 16 years ago by Steven G. Kargl
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

gcc/fortran/ChangeLog
+4 -0

gcc/fortran/ChangeLog-2007
+0 -1

No files found.
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
+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

--- 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