fix merge conflict

8 years ago · f14e9b8d3a
parent c48a4cfb99
commit f14e9b8d3a
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.5818")]
+[assembly: AssemblyVersion("3.0.5857")]