diff options
| author | Geoffrey Keating <geoffk@gcc.gnu.org> | 2006-07-07 18:49:03 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2006-07-07 18:49:03 +0000 |
| commit | f8aaba7798838c50402a99d2ce1a337a5f6a6bfc (patch) | |
| tree | 7c84d8173edb24710bc4028dcb7cf7d774beecce /libjava/testsuite | |
| parent | 417fa55ba52871b56fbe023816a1770dafceda60 (diff) | |
| download | gcc-f8aaba7798838c50402a99d2ce1a337a5f6a6bfc.zip gcc-f8aaba7798838c50402a99d2ce1a337a5f6a6bfc.tar.gz gcc-f8aaba7798838c50402a99d2ce1a337a5f6a6bfc.tar.bz2 | |
Fix conflict with stacktrace.out.
From-SVN: r115266
Diffstat (limited to 'libjava/testsuite')
| -rw-r--r-- | libjava/testsuite/libjava.lang/StackTrace2.out (renamed from libjava/testsuite/libjava.lang/StackTrace.out) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/libjava/testsuite/libjava.lang/StackTrace.out b/libjava/testsuite/libjava.lang/StackTrace2.out index 417d471..417d471 100644 --- a/libjava/testsuite/libjava.lang/StackTrace.out +++ b/libjava/testsuite/libjava.lang/StackTrace2.out |