diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-29 19:41:36 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-29 19:41:36 -0800 |
| commit | 84ab871a18c2a5b2d4dce8c2f42b47f1aada2a09 (patch) | |
| tree | bdd7aa8d210da279493df023ee653225dbebb499 | |
| parent | 8484f35055ceb52a92b68e655ef7c0865b92343b (diff) | |
| download | scala-84ab871a18c2a5b2d4dce8c2f42b47f1aada2a09.tar.gz scala-84ab871a18c2a5b2d4dce8c2f42b47f1aada2a09.tar.bz2 scala-84ab871a18c2a5b2d4dce8c2f42b47f1aada2a09.zip | |
Fixing whitespace-damaged test.
Looks like my attempt to handle whitespace when merging
preserved the correct history less than swimmingly. Am
attempting to patch it up.
| -rw-r--r-- | test/files/run/t5527.check | 1 | ||||
| -rw-r--r-- | test/files/run/t5527.scala | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/files/run/t5527.check b/test/files/run/t5527.check index cae1a80199..bdd5ac8295 100644 --- a/test/files/run/t5527.check +++ b/test/files/run/t5527.check @@ -18,3 +18,4 @@ package <empty> { } } } + diff --git a/test/files/run/t5527.scala b/test/files/run/t5527.scala index 3badffde14..8280ee06ba 100644 --- a/test/files/run/t5527.scala +++ b/test/files/run/t5527.scala @@ -20,7 +20,7 @@ object Test extends DirectTest { } } } - """ + """.trim override def show(): Unit = { // redirect err to out, for logging |