Merge pull request #6049 from dotty-staging/fix-merge

smarter · web-flow · commit 8d09c118c8de · 2019-03-08T21:25:24.000+01:00
Fix check file after merge
diff --git a/tests/neg/i3430.check b/tests/neg/i3430.check
@@ -1,2 +1,2 @@
 <44..44> in i3430.scala
-ambiguous implicit arguments: both object Long in object Ordering and object Short in object Ordering match type Ordering[B] of parameter cmp of method min in trait TraversableOnce
+ambiguous implicit arguments: both object Short in object Ordering and object Int in object Ordering match type Ordering[B] of parameter cmp of method min in trait TraversableOnce

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<44..44> in i3430.scala`
`2`		`-ambiguous implicit arguments: both object Long in object Ordering and object Short in object Ordering match type Ordering[B] of parameter cmp of method min in trait TraversableOnce`
	`2`	`+ambiguous implicit arguments: both object Short in object Ordering and object Int in object Ordering match type Ordering[B] of parameter cmp of method min in trait TraversableOnce`