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/scaladoc/scalacheck | |
| 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/scaladoc/scalacheck')
| -rw-r--r-- | test/scaladoc/scalacheck/HtmlFactoryTest.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/scaladoc/scalacheck/HtmlFactoryTest.scala b/test/scaladoc/scalacheck/HtmlFactoryTest.scala index 98a601bb20..913667b79b 100644 --- a/test/scaladoc/scalacheck/HtmlFactoryTest.scala +++ b/test/scaladoc/scalacheck/HtmlFactoryTest.scala @@ -711,7 +711,7 @@ object Test extends Properties("HtmlFactory") { property("class") = files.get("com/example/p1/Clazz.html") match { case Some(node: scala.xml.Node) => { - property("implicit convertion") = + property("implicit conversion") = node.toString contains "<span class=\"modifier\">implicit </span>" property("gt4s") = |