Fix conflict with stacktrace.out.

From-SVN: r115266

Fix conflict with stacktrace.out.
From-SVN: r115266
f8aaba77 · Geoffrey Keating · 417fa55b · f8aaba77
Commit f8aaba77 authored Jul 07, 2006 by Geoffrey Keating
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

libjava/testsuite/libjava.lang/StackTrace2.out
+0 -0

No files found.
--- a/libjava/testsuite/libjava.lang/StackTrace.out
+++ b/libjava/testsuite/libjava.lang/StackTrace.out