diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-09-02 16:52:24 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-09-02 16:52:24 +0200 |
| commit | 91c4192c39d2bdebf37a97e41d374a39ece8af85 (patch) | |
| tree | e732aa1f0b6b6d65c21e91b40298f722200593f7 /test/files/run/t5256c.check | |
| parent | 0f683b85488185f87a44a11f25edd2bf0f5a1b73 (diff) | |
| parent | 1bbfd6b45b178986bfd26831689f8aa8393ae8a6 (diff) | |
| download | scala-91c4192c39d2bdebf37a97e41d374a39ece8af85.tar.gz scala-91c4192c39d2bdebf37a97e41d374a39ece8af85.tar.bz2 scala-91c4192c39d2bdebf37a97e41d374a39ece8af85.zip | |
Merge branch 'merge/2.10-to-2.11-sept-2' into merge/2.11-to-2.12-is-it-really-sept-2-already-where-was-summer
Conflicts:
versions.properties
Diffstat (limited to 'test/files/run/t5256c.check')
| -rw-r--r-- | test/files/run/t5256c.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/t5256c.check b/test/files/run/t5256c.check index 7fcd0eb722..3eb7b13a97 100644 --- a/test/files/run/t5256c.check +++ b/test/files/run/t5256c.check @@ -2,5 +2,5 @@ class A$1 Test.A$1 java.lang.Object { def foo(): Nothing - def <init>(): A$1 + def <init>(): Test.A$1 } |