summaryrefslogtreecommitdiff
path: root/test/scaladoc/resources/implicit-inheritance-override.scala
diff options
context:
space:
mode:
authorVlad Ureche <vlad.ureche@gmail.com>2012-03-16 01:25:36 +0100
committerVlad Ureche <vlad.ureche@gmail.com>2012-03-16 01:25:36 +0100
commitdca8725cbb04e38f86095fe7fb561fa78cdde9b2 (patch)
tree2da2b213cb448ab7068e9347f04ce12405530ab6 /test/scaladoc/resources/implicit-inheritance-override.scala
parentee51b6e1b1bc4bd60e6f6bbaea6eb3d4be8b3c97 (diff)
downloadscala-dca8725cbb04e38f86095fe7fb561fa78cdde9b2.tar.gz
scala-dca8725cbb04e38f86095fe7fb561fa78cdde9b2.tar.bz2
scala-dca8725cbb04e38f86095fe7fb561fa78cdde9b2.zip
Merged and cleaned the 'feature/inheritdoc' branch
Diffstat (limited to 'test/scaladoc/resources/implicit-inheritance-override.scala')
-rw-r--r--test/scaladoc/resources/implicit-inheritance-override.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/scaladoc/resources/implicit-inheritance-override.scala b/test/scaladoc/resources/implicit-inheritance-override.scala
index 85b8e8d543..5d692f59ad 100644
--- a/test/scaladoc/resources/implicit-inheritance-override.scala
+++ b/test/scaladoc/resources/implicit-inheritance-override.scala
@@ -2,12 +2,12 @@
class Base {
/**
* The base comment. And another sentence...
- *
- * @param arg1 The T term comment
- * @param arg2 The string comment
+ *
+ * @param arg1 The T term comment
+ * @param arg2 The string comment
* @tparam T the type of the first argument
* @return The return comment
- */
+ */
def function[T](arg1: T, arg2: String): Double = 0.0d
}