[PATCH, fortran] Remove SVN merge marker

[Michael Meissner]

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