fix merge conflict

9 years ago · 5c03b0d769
parent 93ae4aab76
commit 5c03b0d769
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.5781.5")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5781.6")]