FIX: fixed some typos and label sizes in ConflictResolverForm
Authored by: floriwan 2012-06-15
Parent: [r284]
Child: [r286]
