From 2fe74ded66f493236d2607b632c0ec269608cc8c Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 8 Mar 2019 21:23:49 +0100 Subject: [PATCH] Fix check file after merge Looks like #6034 and #6040 collided resulting in a CI failure on master. --- tests/neg/i3430.check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/neg/i3430.check b/tests/neg/i3430.check index 253c5a29fd2b..075dba863e43 100644 --- 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 \ No newline at end of file +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