summaryrefslogtreecommitdiff
path: root/test/files/neg/t6040.check
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-11-24 08:35:38 -0500
committerSeth Tisue <seth@tisue.net>2015-11-24 08:35:38 -0500
commite8f3836578c5153fae3f9ded7c4afec6d6d3a6f8 (patch)
tree4458169015b02ecf7e29f805d0dbd6645171620a /test/files/neg/t6040.check
parent3d0cbf9d10416fab8017b5fb46af44f59ee89fd1 (diff)
parent86300fe1b3ab87b2e40616ed78709e8f03e707b5 (diff)
downloadscala-e8f3836578c5153fae3f9ded7c4afec6d6d3a6f8.tar.gz
scala-e8f3836578c5153fae3f9ded7c4afec6d6d3a6f8.tar.bz2
scala-e8f3836578c5153fae3f9ded7c4afec6d6d3a6f8.zip
Merge pull request #4864 from lrytz/merge-2.11-to-2.12-nov-24
Merge 2.11 to 2.12 nov 24
Diffstat (limited to 'test/files/neg/t6040.check')
-rw-r--r--test/files/neg/t6040.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t6040.check b/test/files/neg/t6040.check
index 16c90ede7e..350f796d18 100644
--- a/test/files/neg/t6040.check
+++ b/test/files/neg/t6040.check
@@ -2,7 +2,7 @@ t6040.scala:1: error: extension of type scala.Dynamic needs to be enabled
by making the implicit value scala.language.dynamics visible.
This can be achieved by adding the import clause 'import scala.language.dynamics'
or by setting the compiler option -language:dynamics.
-See the Scala docs for value scala.language.dynamics for a discussion
+See the Scaladoc for value scala.language.dynamics for a discussion
why the feature needs to be explicitly enabled.
class X extends Dynamic
^