Remove svn merge marker

From-SVN: r151095

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d94f459258a8f31b70efd0701f03aaa6e71d29cf..e2691a9f31f227bd2261bb80e7ed28c893a82a0f 100644 (file)
--- 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