Added Clear Conflict action to resolver
[pithos-ms-client] / trunk / packages / Caliburn.Micro.1.2.0 /
2011-08-16 Panagiotis KanavosAdded WPF client based on Caliburn.Micro