diff options
Diffstat (limited to 'test-nsc/files/run/mixins.scala')
-rwxr-xr-x | test-nsc/files/run/mixins.scala | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/test-nsc/files/run/mixins.scala b/test-nsc/files/run/mixins.scala index f896551108..bbc20d33d2 100755 --- a/test-nsc/files/run/mixins.scala +++ b/test-nsc/files/run/mixins.scala @@ -2,6 +2,8 @@ // Test 1: "super" coming from mixins +import Console._; + object Test1 { class A { def f = "A::f"; @@ -58,24 +60,13 @@ object Test3 { Console.println("A"); } -<<<<<<< mixins.scala trait B { println("B"); -======= - class B(x: Unit) { - Console.println("B"); ->>>>>>> 1.5 } -<<<<<<< mixins.scala class C extends A({ println("one"); }, { println("two"); }) with B { println("C"); -======= - class C with A({ Console.println("one"); }, { Console.println("two"); }) - with B({ Console.println("three"); }) { - Console.println("C"); ->>>>>>> 1.5 } def test() = { |