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

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

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