diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-08-24 11:36:36 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-08-24 11:36:36 +0200 |
| commit | 3a543d64158e85b65f8998460c832362bdddec4f (patch) | |
| tree | 665fc16d4932a6d8625fe28ae87c100bb1ee96c1 /test/files/run/t5655.check | |
| parent | cd77e23b76af8538ed7e2c5c90e7845582dff460 (diff) | |
| parent | ded2d4f2e613aad6670b3e5dccbab0feb711b18b (diff) | |
| download | scala-3a543d64158e85b65f8998460c832362bdddec4f.tar.gz scala-3a543d64158e85b65f8998460c832362bdddec4f.tar.bz2 scala-3a543d64158e85b65f8998460c832362bdddec4f.zip | |
Merge pull request #4700 from SethTisue/merge-2.11.x-aug-20
Merge 2.11.x aug 20 [ci: last-only]
Diffstat (limited to 'test/files/run/t5655.check')
| -rw-r--r-- | test/files/run/t5655.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/t5655.check b/test/files/run/t5655.check index 857a5ab556..9191997624 100644 --- a/test/files/run/t5655.check +++ b/test/files/run/t5655.check @@ -6,7 +6,7 @@ scala> import x._ import x._ scala> x -<console>:15: error: reference to x is ambiguous; +<console>:16: error: reference to x is ambiguous; it is imported twice in the same scope by import x._ and import x @@ -14,7 +14,7 @@ and import x ^ scala> x -<console>:15: error: reference to x is ambiguous; +<console>:16: error: reference to x is ambiguous; it is imported twice in the same scope by import x._ and import x |