diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-01-13 09:19:24 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-01-13 09:19:24 +0200 |
| commit | fd0d8d7668aefea359dad4d7737bb4c71344a292 (patch) | |
| tree | 85068eed5cae59724820de8b63143005a3d9506c /Software/Visual_Studio/MachineStudio/Modules | |
| parent | 78d001b5ba7f6fac4fe44a266692addbdc19d6ac (diff) | |
| parent | 3bdeaff66bdfe57d67b27ca7fd8194604499131f (diff) | |
| download | Tango-fd0d8d7668aefea359dad4d7737bb4c71344a292.tar.gz Tango-fd0d8d7668aefea359dad4d7737bb4c71344a292.zip | |
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs index e9f2404e0..ea6584556 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs @@ -21,7 +21,7 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels { public class MainViewVM : StudioViewModel { - #region properties + #region Properties private DateTime _startSelectedDate; public DateTime StartSelectedDate |