fix merge conflict

8 years ago · 9d762c3878
parent 54886db5e5
commit 9d762c3878
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.6200")]
+[assembly: AssemblyVersion("3.1.126")]