diff options
| author | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2005-11-19 08:35:22 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2005-11-19 08:35:22 +0000 |
| commit | 8273ee9f137b960eefe25b8c7aed5b29a74506de (patch) | |
| tree | 107e794ce21f411ece9a48886691dcb502e90bb6 /gcc | |
| parent | 4801f7ed6f120710f282e95132ebdd4f2adf16a5 (diff) | |
| download | gcc-8273ee9f137b960eefe25b8c7aed5b29a74506de.zip gcc-8273ee9f137b960eefe25b8c7aed5b29a74506de.tar.gz gcc-8273ee9f137b960eefe25b8c7aed5b29a74506de.tar.bz2 | |
Remove conflict markers
From-SVN: r107214
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9ca78fe..6e8c90b 100644 --- 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, |