merge conflicts -take remote

1 files changed, 0 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 7a016b376..25dfc2dc8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -57,11 +57,6 @@ namespace Tango.MachineStudio.Common
         public String LastVirtualMachineSerialNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets the logging categories.
-        /// </summary>
-        public List<LogCategory> LoggingCategories { get; set; }
-
-        /// <summary>
         /// Gets or sets the last bounds.
         /// </summary>
         public Rect LastBounds { get; set; }
@@ -189,7 +184,6 @@ namespace Tango.MachineStudio.Common
         public MachineStudioSettings()
         {
             LastBounds = new Rect();
-            LoggingCategories = new List<LogCategory>();
             DefaultIssueReportTags = new List<string>();
             StudioModulesBounds = new List<StudioModuleBounds>();
             Environment = WorkingEnvironment.Remote;