fix merge conflict

8 years ago · f54ed74837
parent 70f48f9cea
commit f54ed74837
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.1.0")]
+[assembly: AssemblyVersion("3.1.260")]