Added Clear Conflict action to resolver
authorpkanavos <pkanavos@gmail.com>
Fri, 11 May 2012 20:26:14 +0000 (23:26 +0300)
committerpkanavos <pkanavos@gmail.com>
Fri, 11 May 2012 20:26:14 +0000 (23:26 +0300)
commita308d2918490f90b84b83d58d7b9c2fab31d0865
treee27e64ff2c192ee0152e39a2a26e5cfed70f793e
parented25cded9c7e766dd85d0ea874814a593e116828
Added Clear Conflict action to resolver
trunk/Pithos.Client.WPF/Converters/EnumTypeConverter.cs
trunk/Pithos.Client.WPF/FileProperties/ConflictResolver.cs
trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
trunk/Pithos.Core/PithosMonitor.cs