merge conflicts

1 files changed, 13 insertions, 0 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateResult.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateResult.cs
index 17ae394ee..85dd5b7d2 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateResult.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateResult.cs
@@ -12,5 +12,18 @@ namespace Tango.PPC.Common.MachineUpdate
         /// Gets or sets the temporary update package path from which to get the last downloaded software version.
         /// </summary>
         public String UpdatePackagePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the application should replace it's binaries.
+        /// </summary>
+        public bool RequiresBinariesUpdate { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachineUpdateResult"/> class.
+        /// </summary>
+        public MachineUpdateResult()
+        {
+            RequiresBinariesUpdate = true;
+        }
     }
 }