From: Michael Meissner <meissner@gcc.gnu.org>
Date: Tue, 25 Aug 2009 20:42:47 +0000 (+0000)
Subject: Remove svn merge marker
X-Git-Tag: releases/gcc-4.5.0~3848
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79232baaf890c7223876b5ffb93ed05e7948d7a3;p=thirdparty%2Fgcc.git

Remove svn merge marker

From-SVN: r151095
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d94f459258a8..e2691a9f31f2 100644
--- 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