Fix non-UTF-8 sequence in ChangeLog-2006 and left-over

conflict marker in testsuite/ChangeLog-2008.

From-SVN: r143380

diff --git a/gcc/ChangeLog-2006 b/gcc/ChangeLog-2006
index 00d47c29139706f4ce86d4bc1c630ffb3844810c..d57f42548e3f68b4d19636ac60c32dbcb0721408 100644 (file)
--- 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 Ã\81vila 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 e89a011549a92ce469834e251a3742a28623dbe3..281c8a6652771a41d5ee2313495a8ff7ebcda4a7 100644 (file)
--- 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