summaryrefslogtreecommitdiff
path: root/test/pending/run/t5274_1.check
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-02-16 13:34:06 +0100
committerAleksandar Prokopec <axel22@gmail.com>2012-02-16 13:34:06 +0100
commit53b05bb12f5a7a50448bcac9434389bf95273c45 (patch)
treed10140f4a3f2ea46dd39b47828c1326e9a61681e /test/pending/run/t5274_1.check
parentf2ccb43a844e484ae511c8cff3fbf534a0d86ebe (diff)
parent91148376049a152edec12348ff9b7e9e93e6ebe1 (diff)
downloadscala-53b05bb12f5a7a50448bcac9434389bf95273c45.tar.gz
scala-53b05bb12f5a7a50448bcac9434389bf95273c45.tar.bz2
scala-53b05bb12f5a7a50448bcac9434389bf95273c45.zip
Merge branch 'master' into execution-context
Conflicts: src/library/scala/package.scala
Diffstat (limited to 'test/pending/run/t5274_1.check')
-rw-r--r--test/pending/run/t5274_1.check3
1 files changed, 0 insertions, 3 deletions
diff --git a/test/pending/run/t5274_1.check b/test/pending/run/t5274_1.check
deleted file mode 100644
index fca8bc3d3e..0000000000
--- a/test/pending/run/t5274_1.check
+++ /dev/null
@@ -1,3 +0,0 @@
-50! = 30414093201713378043612608166064768844377641568960512000000000000
-49! = 608281864034267560872252163321295376887552831379210240000000000
-50!/49! = 50