public ConflictResolver()
{
_form = new ConflictResolverForm();
}
public ConflictResolver()
{
_form = new ConflictResolverForm();
}
public DialogResult ShowConflictDialog(ConflictResolverForm conflictResolverForm)
{
if (this.InvokeRequired)
{
return (DialogResult)Invoke(new InvokeConflict(ShowConflictDialog), new object[] { conflictResolverForm });
}
else
{
DialogResult res = conflictResolverForm.ShowDialog(this);
notifyIcon.Icon = this.Icon0;
return res;
}
}