Merge pull request #3258 from jrudolph/w/fix-typo-that-that-occurs-twice-in-error-messages

fix typo in error messages

2 files changed, 2 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index 4eb8eb933c..6da971338f 100644
--- a/src/compiler/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -1211,7 +1211,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL {
             // See SI-6231 comments in LamdaLift for ideas on how to lift the restriction.
             val msg = sm"""Implementation restriction: local ${iface.fullLocationString} is unable to automatically capture the
                 |free variable ${sym} on behalf of ${currentClass}. You can manually assign it to a val inside the trait,
-                |and refer that that val in ${currentClass}. For more details, see SI-6231."""
+                |and refer to that val in ${currentClass}. For more details, see SI-6231."""
             reporter.error(tree.pos, msg)
           }
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index 2472f63993..719d04a7f9 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -1261,7 +1261,7 @@ trait ContextErrors {
 
     def DoubleParamNamesDefaultError(arg: Tree, name: Name, pos: Int, otherName: Option[Name])(implicit context: Context) = {
       val annex = otherName match {
-        case Some(oName) => "\nNote that that '"+ oName +"' is not a parameter name of the invoked method."
+        case Some(oName) => "\nNote that '"+ oName +"' is not a parameter name of the invoked method."
         case None => ""
       }
       issueNormalTypeError(arg, "parameter '"+ name +"' is already specified at parameter position "+ pos + annex)