public static NewConflict ( ConflictData existingEntry, ConflictData newEntry ) : |
||
existingEntry | ConflictData | The existing entry that is preventing |
newEntry | ConflictData | The new entry that is in conflict with |
return |