Adding a new account now forces a logout to clear any stale Pithos cookies

[pithos-ms-client] / trunk / Pithos.Client.WPF / FileProperties / ConflictsViewModel.cs

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
index 611bf38..2ad1941 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
@@ -100,6 +100,11 @@ namespace Pithos.Client.WPF.FileProperties
             get { return Conflicts!=null && Conflicts.Count > 0; }
         }
 
+        public bool HasNoConflicts
+        {
+            get { return !HasConflicts; }
+        }
+
         public string[]  Actions
         {
             get { return new[] {"Keep Local", "Keep Server", "Keep Both"}; }