fix merge conflict

9 years ago · e951dd20d9
parent 76bfde2675
commit e951dd20d9
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.5786.0")]
+[assembly: AssemblyVersion("3.0.5814")]