diff options
Diffstat (limited to 'test-nsc/files/run/runtime.scala')
-rwxr-xr-x | test-nsc/files/run/runtime.scala | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/test-nsc/files/run/runtime.scala b/test-nsc/files/run/runtime.scala index 8dca7229d2..30f32b7cba 100755 --- a/test-nsc/files/run/runtime.scala +++ b/test-nsc/files/run/runtime.scala @@ -98,26 +98,16 @@ package test2 { def run = Console.println("A"); } -<<<<<<< runtime.scala trait M0 extends A { override def run = { super.run; System.out.println("M0"); } -======= - class M0 extends A { - override def run = { super.run; Console.println("M0"); } ->>>>>>> 1.9 } class M1 extends M0 { override def run = { super.run; Console.println("M1"); } } -<<<<<<< runtime.scala trait N0 extends A { override def run = { super.run; System.out.println("N0"); } -======= - class N0 extends A { - override def run = { super.run; Console.println("N0"); } ->>>>>>> 1.9 } class N1 extends N0 { |