diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-09-02 16:46:23 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-09-02 16:46:23 +0300 |
| commit | cdfa8777b7d433816c2ec5f12b826b53bda917dd (patch) | |
| tree | cc51fe4ba63301dfc69e07a0d7912a5ca3535e39 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj | |
| parent | 2d32d2c6dba3b8dc90692e8c30d509b3c83bc462 (diff) | |
| parent | 62905aaa550ea584f29feae2ba35fc6df6c42c8f (diff) | |
| download | Tango-cdfa8777b7d433816c2ec5f12b826b53bda917dd.tar.gz Tango-cdfa8777b7d433816c2ec5f12b826b53bda917dd.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj')
0 files changed, 0 insertions, 0 deletions