diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-11 16:53:56 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-11 16:53:56 +0300 |
| commit | 111684728db118e40f05efc01287ea91ea295502 (patch) | |
| tree | 10f619288f346b713a31e3231253cd5b68bae481 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs | |
| parent | d045a47ad7363e62b763013fa6afcdb1762a7ce3 (diff) | |
| parent | 7a914abc9e34c12acec0234ab748e17a21833af7 (diff) | |
| download | Tango-111684728db118e40f05efc01287ea91ea295502.tar.gz Tango-111684728db118e40f05efc01287ea91ea295502.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs')
0 files changed, 0 insertions, 0 deletions