This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH, fortran] Remove SVN merge marker
- From: Michael Meissner <meissner at linux dot vnet dot ibm dot com>
- To: gcc-patches at gcc dot gnu dot org, fortran at gcc dot gnu dot org
- Date: Tue, 25 Aug 2009 16:44:52 -0400
- Subject: [PATCH, fortran] Remove SVN merge marker
In doing an update, I noticed there was a stray SVN merge marker left in
gcc/fortran/ChangeLog. I deleted the marker and committed it as obvious.
Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog (revision 151094)
+++ gcc/fortran/ChangeLog (working copy)
@@ -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
--
Michael Meissner, IBM
4 Technology Place Drive, MS 2203A, Westford, MA, 01886, USA
meissner@linux.vnet.ibm.com