Merge pull request #5837 from adriaanm/merge-2.11.x-into-2.12.x

Catch up with 2.11.x

1 files changed, 0 insertions, 2 deletions

diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index e12ce7c2eb..550b987cb6 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -88,7 +88,6 @@ sealed abstract class List[+A] extends AbstractSeq[A]
                                   with Product
                                   with GenericTraversableTemplate[A, List]
                                   with LinearSeqOptimized[A, List[A]]
-                                  with FilteredTraversableInternal[A, List[A]]
                                   with scala.Serializable {
   override def companion: GenericCompanion[List] = List
 
@@ -414,7 +413,6 @@ sealed abstract class List[+A] extends AbstractSeq[A]
   // Create a proxy for Java serialization that allows us to avoid mutation
   // during deserialization.  This is the Serialization Proxy Pattern.
   protected final def writeReplace(): AnyRef = new List.SerializationProxy(this)
-
 }
 
 /** The empty list.