diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-07-24 18:11:19 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-07-24 18:11:19 +0300 |
| commit | 0e448553af26885f648b41fed4001bcbdab9fbee (patch) | |
| tree | b6c2b0ee89cc334f3d04e829f0ec551743e4cc88 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs | |
| parent | 33cebf98be02ede27ee22ca98ee21f3525bfd8b9 (diff) | |
| parent | fd81643e32328a0d548c7cebdba008050ae03673 (diff) | |
| download | Tango-0e448553af26885f648b41fed4001bcbdab9fbee.tar.gz Tango-0e448553af26885f648b41fed4001bcbdab9fbee.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs')
0 files changed, 0 insertions, 0 deletions