Fixing an incomplete svnmerge; first, revert to...

Fixing an incomplete svnmerge; first, revert to r24726.

5 files changed, 2 insertions, 20 deletions

diff --git a/test/files/pos/spec-List.scala b/test/files/pos/spec-List.scala
index 04ab7d1543..e3055f3051 100644
--- a/test/files/pos/spec-List.scala
+++ b/test/files/pos/spec-List.scala
@@ -144,7 +144,7 @@ sealed trait List[@specialized +A] extends LinearSeq[A]
   /** Create a new list which contains all elements of this list
    *  followed by all elements of Traversable `that'
    */
-  override def ++[B >: A, That](xs: GenTraversableOnce[B])(implicit bf: CanBuildFrom[List[A], B, That]): That = {
+  override def ++[B >: A, That](xs: TraversableOnce[B])(implicit bf: CanBuildFrom[List[A], B, That]): That = {
     val b = bf(this)
     if (b.isInstanceOf[ListBuffer[_]]) (this ::: xs.toList).asInstanceOf[That]
     else super.++(xs)
diff --git a/test/files/pos/t2799.scala b/test/files/pos/t2799.scala
index 7710cce26c..fe93c0e301 100644
--- a/test/files/pos/t2799.scala
+++ b/test/files/pos/t2799.scala
@@ -1 +1 @@
-@deprecated("hi mom", "") case class Bob ()
+@deprecated("hi mom") case class Bob ()
diff --git a/test/files/pos/t4402/A.scala b/test/files/pos/t4402/A.scala
deleted file mode 100644
index f43f0865f0..0000000000
--- a/test/files/pos/t4402/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-package ohmy
-
-class A extends other.Bar
diff --git a/test/files/pos/t4402/Bar.java b/test/files/pos/t4402/Bar.java
deleted file mode 100644
index edc00a5fd1..0000000000
--- a/test/files/pos/t4402/Bar.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package other;
-
-public class Bar extends test.Foo {
-  void createMeSth(test.Foo.Inner aaa) {
-    aaa.hello();
-  }
-}
diff --git a/test/files/pos/t4402/Foo.java b/test/files/pos/t4402/Foo.java
deleted file mode 100644
index 585a5e0a2c..0000000000
--- a/test/files/pos/t4402/Foo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package test;
-
-public abstract class Foo {
-  protected interface Inner {
-    public void hello();
-  }
-}
-