fix merge conflict

9 years ago · 895f4a1be4
parent e76d198a86
commit 895f4a1be4
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.5800.2")]
+[assembly: AssemblyVersion("3.0.5784.0")]