diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-06-24 15:19:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-06-24 18:10:42 +1000 |
| commit | 1f7417c763fb199cacc6afedc6e54796916fd673 (patch) | |
| tree | bd00d7e0e47be310172f01c758c01ca5430063c4 /test/files/neg/t2866.check | |
| parent | 73f40564a6b19e8b15f0908c3e24f1a8fe405605 (diff) | |
| parent | 1b09e12ef3b3fea1cab56bac893295f74de23b8b (diff) | |
| download | scala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.gz scala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.bz2 scala-1f7417c763fb199cacc6afedc6e54796916fd673.zip | |
Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624
Diffstat (limited to 'test/files/neg/t2866.check')
| -rw-r--r-- | test/files/neg/t2866.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t2866.check b/test/files/neg/t2866.check index 340fb8da22..bc0da7e355 100644 --- a/test/files/neg/t2866.check +++ b/test/files/neg/t2866.check @@ -5,7 +5,7 @@ t2866.scala:42: error: ambiguous implicit values: both value two of type Int and value one in object A of type => Int match expected type Int - assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambigous in 2.7.6 + assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambiguous in 2.7.6 ^ t2866.scala:50: error: ambiguous implicit values: both value two of type Int |