Remove svn merge marker

From-SVN: r151095

Remove svn merge marker
From-SVN: r151095
79232baa · Michael Meissner · e7f8fba9 · 79232baa
Commit 79232baa authored 15 years ago by Michael Meissner
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/fortran/ChangeLog
+0 -1

No files found.
--- 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