diff options
| author | Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org> | 2000-12-16 08:16:09 +0000 |
|---|---|---|
| committer | Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org> | 2000-12-16 08:16:09 +0000 |
| commit | a472a8887b00197b000168866e8cb278b119c044 (patch) | |
| tree | 271d0eb337c20906a2a4bf4a75dd5d6410e1dcea /gcc | |
| parent | 221c7a7ff73fc1c9eef3ae5238bcfa2c7ae5e33a (diff) | |
| download | gcc-a472a8887b00197b000168866e8cb278b119c044.zip gcc-a472a8887b00197b000168866e8cb278b119c044.tar.gz gcc-a472a8887b00197b000168866e8cb278b119c044.tar.bz2 | |
Remove conflict marker.
From-SVN: r38303
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 88fbe054..c28b22e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -57,7 +57,6 @@ * gcc.dg/cpp/redef2.c: Update. * gcc.dg/cpp/skipping.c: New test. ->>>>>>> 1.929 2000-12-07 Geoffrey Keating <geoffk@redhat.com> * g++.old-deja/g++.other/eh3.C: New testcase. |