diff options
| author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-12 15:38:55 +0100 |
|---|---|---|
| committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-12 15:38:55 +0100 |
| commit | 91fcdf64d406aed26d473091c3328c0cf089e115 (patch) | |
| tree | e3897d0cc6b680d32581a740b16a4ad5ef0839ef /test/files/pos/t1459/App.scala | |
| parent | 51ddeb372b3f0b22041d9a51f3faee17acd7b749 (diff) | |
| parent | 5f5029d2ac6348ecb07fc11f6656621c662ced92 (diff) | |
| download | scala-91fcdf64d406aed26d473091c3328c0cf089e115.tar.gz scala-91fcdf64d406aed26d473091c3328c0cf089e115.tar.bz2 scala-91fcdf64d406aed26d473091c3328c0cf089e115.zip | |
Merge branch 'master' into issue/4147
Conflicts:
.gitignore
Diffstat (limited to 'test/files/pos/t1459/App.scala')
| -rwxr-xr-x | test/files/pos/t1459/App.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/pos/t1459/App.scala b/test/files/pos/t1459/App.scala index 651b285b17..36e5022e94 100755 --- a/test/files/pos/t1459/App.scala +++ b/test/files/pos/t1459/App.scala @@ -1,7 +1,7 @@ package foo import base._ -object App extends Application { +object App extends scala.App { class Concrete extends AbstractBase { override def doStuff(params:java.lang.String*): Unit = println("doStuff invoked") } |