summaryrefslogtreecommitdiff
path: root/test/disabled/run
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-07-13 10:42:58 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-07-13 10:42:58 -0700
commit216e09b3ead43039f2e34a135820ef098c3be74e (patch)
treec312a233cf3e2cf0c7ddcd679d1437a32dc819ae /test/disabled/run
parent9df8f8ae9e36cf1c04929b7b0d2bdfb6fd2f360f (diff)
parent18e3e61778918e4e802b8fb75789635409523372 (diff)
downloadscala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.gz
scala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.bz2
scala-216e09b3ead43039f2e34a135820ef098c3be74e.zip
Merge pull request #4622 from retronym/merge/2.11.x-to-2.12.x-20150713
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'test/disabled/run')
-rw-r--r--test/disabled/run/coder2/Coder2.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/disabled/run/coder2/Coder2.scala b/test/disabled/run/coder2/Coder2.scala
index 43b2e9bcb8..c1ec70b842 100644
--- a/test/disabled/run/coder2/Coder2.scala
+++ b/test/disabled/run/coder2/Coder2.scala
@@ -10,7 +10,7 @@ class SeqCoder(words: List[String]) {
'2' -> "ABC", '3' -> "DEF", '4' -> "GHI", '5' -> "JKL",
'6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ")
- /** Invert the mnemnonics map to give a map from chars 'A' ... 'Z' to '2' ... '9' */
+ /** Invert the mnemonics map to give a map from chars 'A' ... 'Z' to '2' ... '9' */
private val charCode: Map[Char, Char] =
for ((digit, letters) <- m; letter <- letters) yield letter -> digit