From 79232baaf890c7223876b5ffb93ed05e7948d7a3 Mon Sep 17 00:00:00 2001
From: Michael Meissner <meissner@gcc.gnu.org>
Date: Tue, 25 Aug 2009 20:42:47 +0000
Subject: [PATCH] Remove svn merge marker

From-SVN: r151095
---
 gcc/fortran/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d94f459..e2691a9 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
-- 
2.7.4