summaryrefslogtreecommitdiff
path: root/test/files/run/t3964.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-09-18 09:01:51 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-09-18 09:01:51 -0700
commitc5fdc815c30f0565a80a3837f368717a4e81e04d (patch)
tree48d2fc9de28b359fa9ef479e78388b9778f4ef52 /test/files/run/t3964.scala
parent42151a9980be37eae6e8fdf40330070361fd88fd (diff)
parentf4267ccd96a9143c910c66a5b0436aaa64b7c9dc (diff)
downloadscala-c5fdc815c30f0565a80a3837f368717a4e81e04d.tar.gz
scala-c5fdc815c30f0565a80a3837f368717a4e81e04d.tar.bz2
scala-c5fdc815c30f0565a80a3837f368717a4e81e04d.zip
Merge pull request #2961 from paulp/pr/whitespace
Cull extraneous whitespace.
Diffstat (limited to 'test/files/run/t3964.scala')
-rw-r--r--test/files/run/t3964.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/run/t3964.scala b/test/files/run/t3964.scala
index 68ff9a44c4..9b46cdb298 100644
--- a/test/files/run/t3964.scala
+++ b/test/files/run/t3964.scala
@@ -2,15 +2,15 @@
import scala.language.implicitConversions
object Test {
- class Base
+ class Base
object Bob extends Base
class Foo { def bippy = 42 }
class Oof { def bippy = -21 }
-
+
// I am more specific than you
implicit def f1(x: Bob.type): Foo = new Foo
implicit def f2(x: Base): Oof = new Oof
-
+
def main(args: Array[String]): Unit = {
// this would of course print an unambiguous 42
println(Bob.bippy)