diff options
author | Seth Tisue <seth@tisue.net> | 2015-08-20 16:06:13 -0400 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2015-08-20 16:15:17 -0400 |
commit | ded2d4f2e613aad6670b3e5dccbab0feb711b18b (patch) | |
tree | 665fc16d4932a6d8625fe28ae87c100bb1ee96c1 /src/library/scala/Predef.scala | |
parent | cd77e23b76af8538ed7e2c5c90e7845582dff460 (diff) | |
parent | a77e34e4b1ed445368b8412dbbf07340554afd57 (diff) | |
download | scala-ded2d4f2e613aad6670b3e5dccbab0feb711b18b.tar.gz scala-ded2d4f2e613aad6670b3e5dccbab0feb711b18b.tar.bz2 scala-ded2d4f2e613aad6670b3e5dccbab0feb711b18b.zip |
Merge remote-tracking branch 'origin/2.11.x' into 2.12.x
all conflicts were because the changes changed code that
doesn't exist anymore in 2.12; they were resolved with
`git checkout --ours`
c201eac changed bincompat-forward.whitelist.conf but
I dropped the change in this merge because it refers
to AbstractPromise which no longer exists in 2.12
Diffstat (limited to 'src/library/scala/Predef.scala')
-rw-r--r-- | src/library/scala/Predef.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index fa58015a84..334377e838 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -56,7 +56,7 @@ import scala.io.StdIn * only contain natural numbers (i.e. non-negative), and that the result returned * will also be natural. `require` is distinct from `assert` in that if the * condition fails, then the caller of the function is to blame rather than a - * logical error having been made within `addNaturals` itself. `ensures` is a + * logical error having been made within `addNaturals` itself. `ensuring` is a * form of `assert` that declares the guarantee the function is providing with * regards to its return value. * |