diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-11-03 17:02:38 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-11-03 17:02:38 +0200 |
| commit | 1380116fde611986701a0594b66de170f41a97b5 (patch) | |
| tree | 146e63b5343b43649e9e25445e4b50ca515c32a7 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs | |
| parent | 710e0342b992e11ffe70b7cb5c5c2b815263b5d1 (diff) | |
| parent | 81ff404b04a891bdbcd53493b4af85224c9b0cd1 (diff) | |
| download | Tango-1380116fde611986701a0594b66de170f41a97b5.tar.gz Tango-1380116fde611986701a0594b66de170f41a97b5.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs')
0 files changed, 0 insertions, 0 deletions
