From 605cbbd377d56231e666e8323cf4ae7f33221096 Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 14 Jan 2009 18:57:55 +0000
Subject: Fix non-UTF-8 sequence in ChangeLog-2006 and left-over conflict
 marker in testsuite/ChangeLog-2008.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143380 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog-2006 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc/ChangeLog-2006')

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.
-- 
cgit v1.2.1