aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/ChangeLog-2007
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2009-01-14 21:22:53 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2009-01-14 21:22:53 +0000
commit3e55cc6f7c4e97f38555873046f6b3880f102a25 (patch)
treeb579d0cb7982d5c86b0aaa2ab27b9a82e84773c1 /gcc/fortran/ChangeLog-2007
parent765ec70c92c6241242fb5a18e55b41633fac6831 (diff)
downloadgcc-3e55cc6f7c4e97f38555873046f6b3880f102a25.zip
gcc-3e55cc6f7c4e97f38555873046f6b3880f102a25.tar.gz
gcc-3e55cc6f7c4e97f38555873046f6b3880f102a25.tar.bz2
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
Diffstat (limited to 'gcc/fortran/ChangeLog-2007')
-rw-r--r--gcc/fortran/ChangeLog-20071
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog-2007 b/gcc/fortran/ChangeLog-2007
index 9c34c79..4597cb5 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