fix merge conflict

9 years ago · 007f4e193a
parent 670a388f61
commit 007f4e193a
1 changed files with 1 additions and 1 deletions
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,4 @@
 using System.Reflection;

 //[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5913")]
+[assembly: AssemblyVersion("3.0.5938")]