fix merge conflict

9 years ago · 88153d3875
parent 03118de6b7
commit 88153d3875
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.5782.0")]
+[assembly: AssemblyVersion("3.0.5800.0")]