fix merge conflict

9 years ago · 724aa4af40
parent 297cbb2610
commit 724aa4af40
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.5947")]
+[assembly: AssemblyVersion("3.0.5934")]