提交 dfd763bc 编写于 作者: C Cyrus Najmabadi

Merge markers

上级 8f3258d0
......@@ -185,11 +185,7 @@ public State(TService service, SemanticDocument document)
public SemanticMap GetSemanticMap(CancellationToken cancellationToken)
{
<<<<<<< HEAD
_semanticMap ??= this.Document.SemanticModel.GetSemanticMap(this.Expression, cancellationToken);
=======
_semanticMap ??= Document.SemanticModel.GetSemanticMap(Expression, cancellationToken);
>>>>>>> upstream/master
return _semanticMap;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册