From 25a98964b5109aa55b71a8a26886c59903193548 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Thu, 6 Oct 2005 13:14:33 +0000
Subject: *** empty log message ***

---
 test-nsc/files/run/mixins.scala | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'test-nsc/files/run/mixins.scala')

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() = {
-- 
cgit v1.2.3