diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
| commit | 652ba187110a48e5a7887ece87d12b04e4eb8105 (patch) | |
| tree | 60f4841b0b38c574c3c284e45becaad43387e129 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties | |
| parent | 624f0125aa598d78ae9ea4797b3fdc6fbf77c55a (diff) | |
| parent | 924699be4aa943430937ed8cc45b7dae49030000 (diff) | |
| download | Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.tar.gz Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties')
| -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 8440c88b2..eff1f2521 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("4.0.10.0")] +[assembly: AssemblyVersion("4.0.11.0")] [assembly: ComVisible(false)]
\ No newline at end of file |