Changed listbox in ConflictsView.xaml to datagrid

[pithos-ms-client] / trunk / Pithos.Core / FileState.cs

diff --git a/trunk/Pithos.Core/FileState.cs b/trunk/Pithos.Core/FileState.cs
index 2c3869a..3bafda0 100644 (file)
--- a/trunk/Pithos.Core/FileState.cs
+++ b/trunk/Pithos.Core/FileState.cs
@@ -81,6 +81,9 @@ namespace Pithos.Core
         [Property]
         public FileStatus FileStatus { get; set; }
 
+        [Property]
+        public string ConflictReason { get; set; }
+
         private string _checksum;
 
         /// <summary>