diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
| commit | e596d1a65d81a81a54847d90d2d90be3ffbb3d92 (patch) | |
| tree | d6c86e80b08b47271e65bccfe734e80bc531be8f /src/library/scala/collection/concurrent/Map.scala | |
| parent | 4210262867a541d4cbf0aaf2b06bedeef9520c2b (diff) | |
| parent | 6a185e3c97b79716576725f1ecf0ba629e83951d (diff) | |
| download | scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.gz scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.bz2 scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150501
Diffstat (limited to 'src/library/scala/collection/concurrent/Map.scala')
| -rw-r--r-- | src/library/scala/collection/concurrent/Map.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/concurrent/Map.scala b/src/library/scala/collection/concurrent/Map.scala index f0a5f57225..f27dfd57fc 100644 --- a/src/library/scala/collection/concurrent/Map.scala +++ b/src/library/scala/collection/concurrent/Map.scala @@ -49,7 +49,7 @@ trait Map[A, B] extends scala.collection.mutable.Map[A, B] { def putIfAbsent(k: A, v: B): Option[B] /** - * Removes the entry for the specified key if its currently mapped to the + * Removes the entry for the specified key if it's currently mapped to the * specified value. * * $atomicop |