summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-02-03 21:59:54 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-02-03 21:59:54 +1000
commit953559988a698d6663ac983ee7d9944e05bd861d (patch)
treed2b12610d04c9a510e9d5c2b0242118521fa1a15 /src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
parent6ecb997fa8eb305bf547ec8a6106ba2fd777a594 (diff)
parentbf599bc72a1fff4aa812e6d8962b2cabe14725ab (diff)
downloadscala-953559988a698d6663ac983ee7d9944e05bd861d.tar.gz
scala-953559988a698d6663ac983ee7d9944e05bd861d.tar.bz2
scala-953559988a698d6663ac983ee7d9944e05bd861d.zip
Merge commit 'bf599bc' into merge/2.11.x-to-2.12.x-20160203
Conflicts: src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala src/compiler/scala/tools/nsc/transform/Constructors.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/patmat/Logic.scala')
-rw-r--r--src/compiler/scala/tools/nsc/transform/patmat/Logic.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
index 8b2e09495f..4ae97ce281 100644
--- a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
+++ b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
@@ -542,7 +542,7 @@ trait ScalaLogic extends Interface with Logic with TreeAndTypeAnalysis {
*
* (0) A or B must be in the domain to draw any conclusions.
*
- * For example, knowing the the scrutinee is *not* true does not
+ * For example, knowing the scrutinee is *not* true does not
* statically exclude it from being `X`, because that is an opaque
* Boolean.
*