fix merge conflict

8 years ago · 4853e795d7
parent bc58e2862c
commit 4853e795d7
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.1.*")]
-[assembly: AssemblyVersion("3.0.8500")]
+[assembly: AssemblyVersion("3.1.259")]