projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4801f7e)
Remove conflict markers
authorHans-Peter Nilsson <hp@gcc.gnu.org>
Sat, 19 Nov 2005 08:35:22 +0000 (08:35 +0000)
committerHans-Peter Nilsson <hp@gcc.gnu.org>
Sat, 19 Nov 2005 08:35:22 +0000 (08:35 +0000)
From-SVN: r107214

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9ca78fe1036769add553158aaea793433b0df613..6e8c90bb8f1ae82f119f26c6d4e2afd6b58c4fbc 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< .mine
 2005-11-18  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/8355
        * g++.dg/template/friend39.C: New test.
 
-=======
 2005-11-18  James E Wilson  <wilson@specifix.com>
 
        * gcc.dg/builtin-strstr.c: New.
 
->>>>>>> .r107206
 2005-11-18  Richard Henderson  <rth@redhat.com>
 
        * gcc.target/ia64/20010423-1.c, gcc.target/ia64/20020313-1.c,