Added column to indicate that changes need to be merged

2012-11-13 21:29:53 +00:00
parent fbb5023132
commit e977521519
2 changed files with 10 additions and 1 deletions
--- a/PROMS/Sync/Sync/FileCompare.cs
+++ b/PROMS/Sync/Sync/FileCompare.cs
@@ -51,6 +51,12 @@ namespace Sync
 		{
 			get { return _ReadOnly; }
 		}
+		private bool _Merge = false;
+		public bool Merge
+		{
+			get { return _Merge; }
+			set { _Merge = value; }
+		}
 		public FileCompare(FileInfo development, FileInfo sourceSafe)
 		{
 			_Developement = development;