From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Tue, 21 Jun 2011 08:15:36 +0000 (+0200)
Subject: Remove >>>> marker.
X-Git-Tag: releases/gcc-4.7.0~5875
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1795c28e175fbdf2a23d8bf0293f95794c7167bd;p=thirdparty%2Fgcc.git

Remove >>>> marker.

From-SVN: r175243
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 235d40959ea2..e6c429f4ce9a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -66,7 +66,6 @@
 
 	* regrename.c (do_replace): Don't update notes.
 
->>>>>>> .r175238
 2011-06-20  Alan Modra  <amodra@gmail.com>
 
 	* config/rs6000/rs6000.c (create_TOC_reference): Wrap high part