Merge pull request #3265 from retronym/merge/2.10.x-to-master

Merge 2.10.x to master

1 files changed, 0 insertions, 17 deletions

diff --git a/docs/examples/futures.scala b/docs/examples/futures.scala
deleted file mode 100644
index e05b6b330e..0000000000
--- a/docs/examples/futures.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package examples
-
-import concurrent.ops._
-
-object futures {
-  def someLengthyComputation = 1
-  def anotherLengthyComputation = 2
-  def f(x: Int) = x + x
-  def g(x: Int) = x * x
-
-  def main(args: Array[String]) {
-    val x = future(someLengthyComputation)
-    anotherLengthyComputation
-    val y = f(x()) + g(x())
-    println(y)
-  }
-}