merge conflicts

1 files changed, 4 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index eb172069e..2bb96c1e5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -94,6 +94,8 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         public RelayCommand ToggleRealTimePaused { get; set; }
 
+        public RelayCommand ClearRealTimeLogsCommand { get; set; }
+
         public ApplicationLogsViewVM(LoggingNavigationManager navigation, INotificationProvider notification)
         {
             _notification = notification;
@@ -122,6 +124,8 @@ namespace Tango.MachineStudio.Logging.ViewModels
             LogManager.NewLog += LogManager_NewLog;
 
             ToggleRealTimePaused = new RelayCommand(() => RealTimePaused = !RealTimePaused);
+
+            ClearRealTimeLogsCommand = new RelayCommand(() => { _realTimeLogs.Clear(); });
         }
 
         private void LogManager_NewLog(object sender, LogItemBase log)