WL#3150: Conflict Resolution Testing

Affects: Server-7.0   —   Status: Un-Assigned   —   Priority: Medium

DESCRIPTION

1. Define requirements that needs to be tested
2. Write test cases