diff options
| author | lerdsuwa <lerdsuwa@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-16 08:16:09 +0000 |
|---|---|---|
| committer | lerdsuwa <lerdsuwa@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-16 08:16:09 +0000 |
| commit | 0c1bbe4e47394a9ea9beba38eaa38e7da2a27bad (patch) | |
| tree | 271d0eb337c20906a2a4bf4a75dd5d6410e1dcea /gcc/testsuite | |
| parent | 82ce0f9b4fce968d9e2a51d8137e583aea75ebcd (diff) | |
| download | gcc-0c1bbe4e47394a9ea9beba38eaa38e7da2a27bad.tar.gz | |
Remove conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38303 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite')
| -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 88fbe054d00..c28b22e48d3 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. |