(minor) KT-11588 Type aliases: fix conflicts after rebase.

2016-05-20 12:18:03 +03:00
parent a2ec580119
commit 15c47ead97
2 changed files with 3 additions and 3 deletions
@@ -701,7 +701,7 @@ public class DescriptorResolver {
            }
            else {
                LexicalWritableScope writableScope = new LexicalWritableScope(
-                        scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace),
+                        scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace, overloadChecker),
                        LexicalScopeKind.TYPE_ALIAS_HEADER);
                typeParameterDescriptors = resolveTypeParametersForDescriptor(
                        typeAliasDescriptor, writableScope, scope, typeParameters, trace);