From 1795c28e175fbdf2a23d8bf0293f95794c7167bd Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Tue, 21 Jun 2011 10:15:36 +0200
Subject: [PATCH] Remove >>>> marker.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 235d40959ea..e6c429f4ce9 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
-- 
2.30.2