merge conflict

1 files changed, 4 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index c7ac60ace..ee9337eb3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -131,11 +131,11 @@ namespace Tango.MachineStudio.UI.StudioApplication
         /// <summary>
         /// Gets the machine studio application version.
         /// </summary>
-        public string Version
+        public Version Version
         {
             get
             {
-                return AssemblyHelper.GetCurrentAssemblyVersion().ToString(4);
+                return AssemblyHelper.GetCurrentAssemblyVersion();
             }
         }
 
@@ -276,11 +276,11 @@ namespace Tango.MachineStudio.UI.StudioApplication
         /// <summary>
         /// Gets the core libraries version.
         /// </summary>
-        public string CoreVersion
+        public Version CoreVersion
         {
             get
             {
-                return typeof(ExtendedObject).Assembly.GetName().Version.ToString(3);
+                return typeof(ExtendedObject).Assembly.GetName().Version;
             }
         }