Share via


ResolvedConflictEventArgs.Conflict Property

Gets the conflict that was resolved.

Namespace:  Microsoft.TeamFoundation.VersionControl.Client
Assembly:  Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)

Syntax

'Declaration
Public ReadOnly Property Conflict As Conflict
public Conflict Conflict { get; }
public:
property Conflict^ Conflict {
    Conflict^ get ();
}
member Conflict : Conflict with get
function get Conflict () : Conflict

Property Value

Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict
The conflict that was resolved.

.NET Framework Security

See Also

Reference

ResolvedConflictEventArgs Class

Microsoft.TeamFoundation.VersionControl.Client Namespace