fix merge conflict

8 years ago · 0d0e4ad695
parent 44d41ad74c
commit 0d0e4ad695
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.2")]
+[assembly: AssemblyVersion("3.1.286")]