diff options
| author | Feng Wang <fengwang@gcc.gnu.org> | 2005-05-18 09:56:46 +0000 |
|---|---|---|
| committer | Feng Wang <fengwang@gcc.gnu.org> | 2005-05-18 09:56:46 +0000 |
| commit | 01063d48ed40614f1faad8c74207a2d64b1ab255 (patch) | |
| tree | bb9b0a7a644071e5a33d7e21c376d9ecb2cad288 /gcc | |
| parent | 1e7d0a6431a7a75998d0923aeb7acc358b4d4909 (diff) | |
| download | gcc-01063d48ed40614f1faad8c74207a2d64b1ab255.zip gcc-01063d48ed40614f1faad8c74207a2d64b1ab255.tar.gz gcc-01063d48ed40614f1faad8c74207a2d64b1ab255.tar.bz2 | |
fix ChangeLog conflict.
From-SVN: r99893
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 38f6579..45bdf06 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -31,7 +31,6 @@ libiberty.h. * gcc.dg/compat/generate-random_r.c: Likewise. ->>>>>>> 1.5488 2005-05-17 Paolo Bonzini <bonzini@gnu.org> * gcc.dg/fold-div-1.c, gcc.dg/recip-1.c, gcc.dg/recip-2.c: New. |