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 /libjava/testsuite/libjava.lang | |
| parent | 82ce0f9b4fce968d9e2a51d8137e583aea75ebcd (diff) | |
| download | ppe42-gcc-0c1bbe4e47394a9ea9beba38eaa38e7da2a27bad.tar.gz ppe42-gcc-0c1bbe4e47394a9ea9beba38eaa38e7da2a27bad.zip | |
Remove conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38303 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/libjava.lang')
0 files changed, 0 insertions, 0 deletions
