aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d94f459..e2691a9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -80,7 +80,6 @@
in both modes to handle consecutive single quotes.
Test for extra characters in fmt, issue warning.
->>>>>>> .r151068
2009-08-21 Janus Weil <janus@gcc.gnu.org>
PR fortran/41106