diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-09-10 12:23:08 +0300 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-09-10 12:23:08 +0300 |
| commit | 973d88789d9e3e281aea97a5297041c44c51b9d9 (patch) | |
| tree | 2327f644afa5f9f57f5eb531d27118e605c58883 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | |
| parent | fb5deae5c3a81a5fa0f010f9c48a208e37e0f991 (diff) | |
| parent | 3446e5c95e5b6390b8456d269ddce42caac39325 (diff) | |
| download | Tango-973d88789d9e3e281aea97a5297041c44c51b9d9.tar.gz Tango-973d88789d9e3e281aea97a5297041c44c51b9d9.zip | |
merge conflict take local
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs')
0 files changed, 0 insertions, 0 deletions