summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2017-03-31 15:16:18 -0400
committerGitHub <noreply@github.com>2017-03-31 15:16:18 -0400
commit232d95a198c94da0c6c8393624e83e9b9ac84e81 (patch)
tree82d327c7d54603c36b51f7dbd3d93f0043f6484d
parentecf3fa6c06c0a73abb3616fb87d08040369c6294 (diff)
parent8e62040c5eab015bb52b9d65082840f0a9e4bc23 (diff)
downloadscala-232d95a198c94da0c6c8393624e83e9b9ac84e81.tar.gz
scala-232d95a198c94da0c6c8393624e83e9b9ac84e81.tar.bz2
scala-232d95a198c94da0c6c8393624e83e9b9ac84e81.zip
Merge pull request #5817 from ashawley/java-converters-typo
Fix typo in JavaConverters doc
-rw-r--r--src/library/scala/collection/JavaConverters.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/library/scala/collection/JavaConverters.scala b/src/library/scala/collection/JavaConverters.scala
index d48a1764e9..2337f0ef84 100644
--- a/src/library/scala/collection/JavaConverters.scala
+++ b/src/library/scala/collection/JavaConverters.scala
@@ -18,12 +18,12 @@ import convert._
*
* The following conversions are supported via `asScala` and `asJava`:
*{{{
- * scala.collection.Iterable <=> java.lang.Iterable
- * scala.collection.Iterator <=> java.util.Iterator
- * scala.collection.mutable.Buffer <=> java.util.List
- * scala.collection.mutable.Set <=> java.util.Set
- * scala.collection.mutable.Map <=> java.util.Map
- * scala.collection.mutable.concurrent.Map <=> java.util.concurrent.ConcurrentMap
+ * scala.collection.Iterable <=> java.lang.Iterable
+ * scala.collection.Iterator <=> java.util.Iterator
+ * scala.collection.mutable.Buffer <=> java.util.List
+ * scala.collection.mutable.Set <=> java.util.Set
+ * scala.collection.mutable.Map <=> java.util.Map
+ * scala.collection.concurrent.Map <=> java.util.concurrent.ConcurrentMap
*}}}
* The following conversions are supported via `asScala` and through
* specially-named extension methods to convert to Java collections, as shown: