From ed8a0bc47c8aa359f417360d8443770b02327e1c Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Wed, 14 Jan 2009 19:57:55 +0100
Subject: [PATCH] Fix non-UTF-8 sequence in ChangeLog-2006 and left-over
 conflict marker in testsuite/ChangeLog-2008.

From-SVN: r143380
---
 gcc/ChangeLog-2006           | 2 +-
 gcc/testsuite/ChangeLog-2008 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gcc/ChangeLog-2006 b/gcc/ChangeLog-2006
index 00d47c29139..d57f42548e3 100644
--- a/gcc/ChangeLog-2006
+++ b/gcc/ChangeLog-2006
@@ -22671,7 +22671,7 @@
 	* basic-block.h: Remove the prototype for
 	partition_hot_cold_basic_blocks.
 
-2006-01-16  Rafael Ávila de EspÃ�­ndola <rafael.espindola@gmail.com>
+2006-01-16  Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
 
 	* cppspec.c (lang_specific_spec_functions): Remove.
 	* gcc.c (lookup_spec_function): Use static_spec_functions directly.
diff --git a/gcc/testsuite/ChangeLog-2008 b/gcc/testsuite/ChangeLog-2008
index e89a011549a..281c8a66527 100644
--- a/gcc/testsuite/ChangeLog-2008
+++ b/gcc/testsuite/ChangeLog-2008
@@ -3280,7 +3280,6 @@
 	PR tree-optimization/37508
 	* gcc.dg/tree-ssa/pr37508.c: New testcase.
 
->>>>>>> .r140590
 2008-09-15  Aldy Hernandez  <aldyh@redhat.com>
 
 	* g++.old-deja/g++.brendan/crash16.C: Function name is the correct 
-- 
2.30.2