From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Wed, 14 Jan 2009 21:22:53 +0000 (+0000)
Subject: ChangeLog-2007: Clean out svn merge droppings.
X-Git-Tag: releases/gcc-4.4.0~864
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e55cc6f7c4e97f38555873046f6b3880f102a25;p=thirdparty%2Fgcc.git

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b3d179910cca..d4eae5e593c5 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 9c34c79ca024..4597cb58fd3b 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