diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-07-10 11:01:09 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-07-10 11:01:09 +0300 |
| commit | 154ef1df567c78d2758c95acabce1a4da4815c39 (patch) | |
| tree | c9ea3a621c7c0bbf73faed1d2fe216452200695f /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj | |
| parent | 7383c73aa6c5f6001d474e6a50c9d5a57a56c09d (diff) | |
| parent | 94844258268fa1a6ee466c6ec666a051a4ce0529 (diff) | |
| download | Tango-154ef1df567c78d2758c95acabce1a4da4815c39.tar.gz Tango-154ef1df567c78d2758c95acabce1a4da4815c39.zip | |
merge coflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj')
0 files changed, 0 insertions, 0 deletions