diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-08 16:38:27 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-08 16:38:27 +0300 |
| commit | be5c498b723efa8f8e02332e5af40ea0214b0fb7 (patch) | |
| tree | fac99de033373d1870177433b93eb065132413d1 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | ddf8b4ad6edff6b9ac1e80d0a55cff5edb06a3e8 (diff) | |
| parent | a610818fef1bafdd75ab904d19fa7f206942ce97 (diff) | |
| download | Tango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.tar.gz Tango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.zip | |
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index ea359e8bb..02f5a3ea0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("2.4.18.18218")] +[assembly: AssemblyVersion("2.7.21.18219")] [assembly: ComVisible(false)]
\ No newline at end of file |