summaryrefslogtreecommitdiff
path: root/test/files/presentation/doc/src/Test.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-12-20 19:13:33 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-12-20 19:13:33 -0800
commit27643546e8eb4d2c5da6fc30a998e7ee799defcc (patch)
tree2480f714bcc3a1a5e1e0ecda7a476c3b7a3a4972 /test/files/presentation/doc/src/Test.scala
parent11ba640ebe3cffc1f6671e799ce2b14964f29b31 (diff)
parent106ca1b6767c60912b6726eeb1d435f6e22a025f (diff)
downloadscala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.tar.gz
scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.tar.bz2
scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.zip
Merge pull request #1794 from paulp/merge-2.10.x
Merge 2.10.x into master.
Diffstat (limited to 'test/files/presentation/doc/src/Test.scala')
-rwxr-xr-xtest/files/presentation/doc/src/Test.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/presentation/doc/src/Test.scala b/test/files/presentation/doc/src/Test.scala
new file mode 100755
index 0000000000..fcc1554994
--- /dev/null
+++ b/test/files/presentation/doc/src/Test.scala
@@ -0,0 +1 @@
+object Test \ No newline at end of file