Fix merge issues

This commit is contained in:
Ron Buckton
2016-06-01 11:43:23 -07:00
parent a07965aad8
commit c9ec4e22e7
2 changed files with 2 additions and 2 deletions

View File

@@ -1223,7 +1223,7 @@ namespace ts {
const left = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).left : (<PropertyAccessExpression>name).expression;
const right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>name).name;
const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors, dontResolveAlias, location);
const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors, /*dontResolveAlias*/ false, location);
if (!namespace || namespace === unknownSymbol || nodeIsMissing(right)) {
return undefined;
}