summaryrefslogtreecommitdiff
path: root/test/files/run/json.scala
diff options
context:
space:
mode:
authorAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-07 14:53:37 +0100
committerAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-07 14:53:37 +0100
commit014a13d2be634bb3ab3468d0c071a9a870a9a9b0 (patch)
tree491ad18ca796a70b34be1d4732b80c371bfd650d /test/files/run/json.scala
parenta36175feb5bfce59909fa4f3d9d5df6753b6ee3a (diff)
parent332fec96e31840878bed41dd7b5314b97d8da7c2 (diff)
downloadscala-014a13d2be634bb3ab3468d0c071a9a870a9a9b0.tar.gz
scala-014a13d2be634bb3ab3468d0c071a9a870a9a9b0.tar.bz2
scala-014a13d2be634bb3ab3468d0c071a9a870a9a9b0.zip
Merge branch 'master' of https://github.com/scala/scala into execution-context
Diffstat (limited to 'test/files/run/json.scala')
-rw-r--r--test/files/run/json.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/json.scala b/test/files/run/json.scala
index 7d3b635006..a81f12564c 100644
--- a/test/files/run/json.scala
+++ b/test/files/run/json.scala
@@ -3,7 +3,7 @@ import scala.collection.immutable.TreeMap
object Test extends App {
/* This method converts parsed JSON back into real JSON notation with objects in
- * sorted-key order. Not required by the spec, but it allows us to to a stable
+ * sorted-key order. Not required by the spec, but it allows us to do a stable
* toString comparison. */
def jsonToString(in : Any) : String = in match {
case l : List[_] => "[" + l.map(jsonToString).mkString(", ") + "]"