diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-01-01 14:35:29 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-01-01 14:35:29 +0200 |
| commit | 253ce3357f1b83ed25251e5779fe41b60b81bcf3 (patch) | |
| tree | 420ea123e1d59e420cd8618b50acb18af1bb6085 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs | |
| parent | 7b7200235e2b78ac518860adcb04a59bebbdd54c (diff) | |
| parent | 93d5cf8be64904dd59fb74d76f283f776eb886c7 (diff) | |
| download | Tango-253ce3357f1b83ed25251e5779fe41b60b81bcf3.tar.gz Tango-253ce3357f1b83ed25251e5779fe41b60b81bcf3.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs')
0 files changed, 0 insertions, 0 deletions