From 53935db9922223b9200f69eeeb745b2c90ae784f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 5 Dec 2019 18:25:17 +0300
Subject: [PATCH] [FIR] fix compilation error (arose due to commit conflict)

---
 .../resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
index c467e44fa0b..c0df308e4a9 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
@@ -283,8 +283,7 @@ class FirCallResolver(
             typeArguments = typeArguments,
             session,
             file,
-            implicitReceiverStack,
-            container
+            implicitReceiverStack
         ) { it.resultType }
         val candidateFactory = CandidateFactory(this, callInfo)
         val candidates = mutableListOf<Candidate>()