diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
| commit | 652ba187110a48e5a7887ece87d12b04e4eb8105 (patch) | |
| tree | 60f4841b0b38c574c3c284e45becaad43387e129 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture | |
| parent | 624f0125aa598d78ae9ea4797b3fdc6fbf77c55a (diff) | |
| parent | 924699be4aa943430937ed8cc45b7dae49030000 (diff) | |
| download | Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.tar.gz Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs index 3d282367a..bbe5432e9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs @@ -174,6 +174,11 @@ namespace Tango.MachineStudio.DataCapture.ViewModels #region Constructors + public MainViewVM() + { + + } + /// <summary> /// Initializes a new instance of the <see cref="MainViewVM"/> class. /// </summary> |