summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeather Miller <heather.miller@epfl.ch>2012-11-02 00:08:08 +0100
committerHeather Miller <heather.miller@epfl.ch>2012-11-02 15:00:20 +0100
commit158fea688427c1d3b6d8070ca503511a384f0ee4 (patch)
tree5223a1d7d839c157e60d481d140c373994c05142
parent554f8bb0389f766c3d0778b1b323fafa3097a2f6 (diff)
downloadscala-158fea688427c1d3b6d8070ca503511a384f0ee4.tar.gz
scala-158fea688427c1d3b6d8070ca503511a384f0ee4.tar.bz2
scala-158fea688427c1d3b6d8070ca503511a384f0ee4.zip
Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov
-rw-r--r--src/library/scala/concurrent/Future.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index 111900e7bc..f308b674bb 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -58,7 +58,7 @@ import scala.reflect.ClassTag
* Instead, the future is completed with a ExecutionException with one of the exceptions above
* as the cause.
* If a future is failed with a `scala.runtime.NonLocalReturnControl`,
- * it is completed with a value instead from that throwable instead instead.
+ * it is completed with a value from that throwable instead.
*
* @define nonDeterministic
* Note: using this method yields nondeterministic dataflow programs.