fix merge conflict

9 years ago · 93817bdb7b
parent 43377ec1e2
commit 93817bdb7b
1 changed files with 2 additions and 2 deletions
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,4 @@
 using System.Reflection;
-[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5781.3")]
+[assembly: AssemblyVersion("3.0.5781.4")]