Merge remote-tracking branch 'origin/2.10.2' into merge/2.10.2-to-2.10.x

Better late than never.

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala

1 files changed, 0 insertions, 15 deletions

diff --git a/test/files/pos/t7234.scala b/test/files/pos/t7234.scala
deleted file mode 100644
index 59a233d835..0000000000
--- a/test/files/pos/t7234.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-trait Main {
-  trait A {
-    type B
-  }
-  trait C {
-    def c(a: A, x: Int = 0)(b: a.B)
-  }
-  def c: C
-  def d(a: A, x: Int = 0)(b: a.B)
-
-  def ok1(a: A)(b: a.B) = c.c(a, 42)(b)
-  def ok2(a: A)(b: a.B) = d(a)(b)
-
-  def fail(a: A)(b: a.B) = c.c(a)(b)
-}