merge conflict

1 files changed, 7 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 2920c8dd9..219b6faf0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using Tango.BL;
+using Tango.Integration.Operation;
 using Tango.Logging;
 using Tango.PMR.Printing;
 using Tango.Settings;
@@ -104,6 +105,11 @@ namespace Tango.MachineStudio.Common
         public JobUploadStrategy JobUploadStrategy { get; set; }
 
         /// <summary>
+        /// Gets or sets the job number of units method.
+        /// </summary>
+        public JobUnitsMethods JobUnitsMethod { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether to by pass environment version check.
         /// </summary>
         public bool ByPassEnvironmentVersionCheck { get; set; }
@@ -155,6 +161,7 @@ namespace Tango.MachineStudio.Common
             MaximumCacheTime = TimeSpan.FromMinutes(5);
             CachingMode = ObservablesContextInMemoryCachingMode.None;
             Theme = MachineStudioTheme.Light;
+            JobUnitsMethod = JobUnitsMethods.Operator;
         }
     }
 }