summaryrefslogtreecommitdiff
path: root/test/files/neg/t6667b.check
diff options
context:
space:
mode:
authorFrançois Garillot <francois@garillot.net>2013-09-24 10:21:10 +0200
committerFrançois Garillot <francois@garillot.net>2013-09-24 10:21:10 +0200
commit710401d8aec814d95b25ca2104036aa414a5db35 (patch)
treee6374925f1719b65ceb51202aacfb6257754ff6f /test/files/neg/t6667b.check
parent7d570b54c3c895bc8948adeca2e463d135e38feb (diff)
downloadscala-710401d8aec814d95b25ca2104036aa414a5db35.tar.gz
scala-710401d8aec814d95b25ca2104036aa414a5db35.tar.bz2
scala-710401d8aec814d95b25ca2104036aa414a5db35.zip
Revert "Merge pull request #2957 from paulp/pr/parser-improvements"
This reverts commit 884e1ce762d98b29594146d37b85384581d9ba96, reversing changes made to f6fcc4431f272c707d49de68add532c452dd4b0f.
Diffstat (limited to 'test/files/neg/t6667b.check')
-rw-r--r--test/files/neg/t6667b.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t6667b.check b/test/files/neg/t6667b.check
index a8705fa1c2..99cea9a47c 100644
--- a/test/files/neg/t6667b.check
+++ b/test/files/neg/t6667b.check
@@ -3,11 +3,11 @@ t6667b.scala:16: error: ambiguous implicit values:
and value b of type Test.Box
match expected type Test.Box
new Test()
- ^
+ ^
t6667b.scala:19: error: ambiguous implicit values:
both value a in object Test of type => Test.Box
and value b of type Test.Box
match expected type Test.Box
new Test()
- ^
+ ^
two errors found