aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-08-08 16:38:27 +0300
committerAvi Levkovich <avi@twine-s.com>2018-08-08 16:38:27 +0300
commitbe5c498b723efa8f8e02332e5af40ea0214b0fb7 (patch)
treefac99de033373d1870177433b93eb065132413d1 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB
parentddf8b4ad6edff6b9ac1e80d0a55cff5edb06a3e8 (diff)
parenta610818fef1bafdd75ab904d19fa7f206942ce97 (diff)
downloadTango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.tar.gz
Tango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.zip
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
index 404c1519f..3b589e28b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
using System.Windows;
[assembly: AssemblyTitle("Tango - Machine Studio DB Module")]
-[assembly: AssemblyVersion("2.0.6.1407")]
+[assembly: AssemblyVersion("2.0.7.1633")]
[assembly: ComVisible(false)]