Commit 79232baa by Michael Meissner

Remove svn merge marker

From-SVN: r151095
parent e7f8fba9
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
in both modes to handle consecutive single quotes. in both modes to handle consecutive single quotes.
Test for extra characters in fmt, issue warning. Test for extra characters in fmt, issue warning.
>>>>>>> .r151068
2009-08-21 Janus Weil <janus@gcc.gnu.org> 2009-08-21 Janus Weil <janus@gcc.gnu.org>
PR fortran/41106 PR fortran/41106
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment